From d280a3ccc1a0803def47fad07524d288e604e9df Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Wed, 3 Oct 2018 17:42:22 +0600
Subject: [PATCH 01/74] wip

---
 meta/server-db-docs/sales.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/server-db-docs/sales.md b/meta/server-db-docs/sales.md
index 6ba776cfb..4088ccebb 100644
--- a/meta/server-db-docs/sales.md
+++ b/meta/server-db-docs/sales.md
@@ -27,7 +27,6 @@ Joi.object().keys({
     discountedAmount: Joi.number().max(999999999999999).required(),
     serviceChargeAmount: Joi.number().max(999999999999999).required(),
     totalBilled: Joi.number().max(999999999999999).required(),
-    wasInitiallyCreditSale: Joi.boolean().required(),
 
     totalPaidAmount: Joi.number().max(999999999999999).required(),
     paymentList: Joi.array().required().items(

From 0f8432582512baefa5206743a890b54dccaafc34 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Wed, 3 Oct 2018 19:53:12 +0600
Subject: [PATCH 02/74] client base done

---
 client/src/page-pos.html | 64 +++++++++++++++++++++++++++++-----------
 1 file changed, 47 insertions(+), 17 deletions(-)

diff --git a/client/src/page-pos.html b/client/src/page-pos.html
index 63d42448e..9fe1df65a 100644
--- a/client/src/page-pos.html
+++ b/client/src/page-pos.html
@@ -222,28 +222,37 @@
                 <b>{{$round(customer.balance)}} [[app.settings.monetaryUnit]]</b>
               </template>
 
-              <paper-input class="payment--paidAmount" value="{{payment.paidAmount}}" on-input="genericPaymentInputChanged" on-change="genericPaymentInputChanged" type="number" required min="0" error-message="[[verses.pos.paidAmountInputError]]" label="[[verses.pos.paidAmountInput]]">
-                <div slot="suffix">[[app.settings.monetaryUnit]]</div>
-              </paper-input>
-
               <paper-dropdown-menu class="full-width-paper-dropdown" label="[[verses.pos.paymentMethod]]" class="mr-4">
                 <paper-listbox slot="dropdown-content" selected="{{payment.paymentMethod}}" attr-for-selected="name">
                   <paper-item name="cash">[[verses.general.cash]]</paper-item>
                   <paper-item name="card">[[verses.general.card]]</paper-item>
                   <paper-item name="digital">[[verses.general.digital]]</paper-item>
+                  <template is="dom-if" if="[[customer]]">
+                    <paper-item name="change-wallet">change wallet</paper-item>
+                  </template>
                 </paper-listbox>
               </paper-dropdown-menu>
 
-              <template is="dom-if" if="[[payment.paidAmount]]">
-                <br> [[verses.pos.changeAmount]]:
-                <b>{{$round(payment.changeAmount)}} [[app.settings.monetaryUnit]]</b>
+              {{$json(payment.paymentMethod)}}
+
+              <template is="dom-if" if="[[isPaymentMethodCash(payment.paymentMethod)]]">
+                <paper-input class="payment--paidAmount" value="{{payment.paidAmount}}" on-input="genericPaymentInputChanged" on-change="genericPaymentInputChanged" type="number" required min="0" error-message="[[verses.pos.paidAmountInputError]]" label="[[verses.pos.paidAmountInput]]">
+                  <div slot="suffix">[[app.settings.monetaryUnit]]</div>
+                </paper-input>
+              </template>
 
-                <br>
-                <template is="dom-if" if="[[customer]]">
-                  <template is="dom-if" if="[[isChangeAmountPositive(payment.changeAmount)]]">
-                    <paper-checkbox checked="{{payment.shouldSaveChangeInAccount}}">
-                      [[verses.pos.shouldSaveChangeInAccount]]
-                    </paper-checkbox>
+              <template is="dom-if" if="[[isPaymentMethodCash(payment.paymentMethod)]]">
+                <template is="dom-if" if="[[payment.changeAmount]]">
+                  <br> [[verses.pos.changeAmount]]:
+                  <b>{{$round(payment.changeAmount)}} [[app.settings.monetaryUnit]]</b>
+
+                  <br>
+                  <template is="dom-if" if="[[customer]]">
+                    <template is="dom-if" if="[[payment.changeAmount]]">
+                      <paper-checkbox checked="{{payment.shouldSaveChangeInAccount}}">
+                        [[verses.pos.shouldSaveChangeInAccount]]
+                      </paper-checkbox>
+                    </template>
                   </template>
                 </template>
               </template>
@@ -458,6 +467,27 @@
           }
         }
 
+        console.log("paymentMethod: ", paymentMethod);
+
+        // calculating change amount, paid amount depending on payment method
+        if(paymentMethod === 'cash') {          
+          if (paidAmount > totalBilled) {
+            changeAmount = paidAmount - totalBilled;
+          } else {
+            changeAmount = 0;
+          }
+        }
+        
+        if(paymentMethod === 'card' || paymentMethod === 'digital') {
+          changeAmount = 0;
+          paidAmount = totalBilled;
+        }
+
+        if(paymentMethod === 'change-wallet') {
+          changeAmount = 0;
+          paidAmount = 0;
+        }
+
         // returning updated payment info
         this.payment = {
           totalAmount,
@@ -547,14 +577,14 @@
         this._processAddSales({ outletId: this.params.outlet, payment: this.payment });
       }
 
-      isChangeAmountPositive(changeAmount) {
-        return changeAmount > 0;
-      }
-
       isDiscountTypePercent(discountType) {
         return (discountType === 'percent');
       }
 
+      isPaymentMethodCash(paymentMethod) {
+        return (paymentMethod === 'cash');
+      }
+
       // region: misc =================================
 
     }

From 45a5a13f3318b6d8632e547f6014c85759e54d6a Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Wed, 3 Oct 2018 20:20:36 +0600
Subject: [PATCH 03/74] Added workaround for the payment method dropdown issue

---
 client/src/page-pos.html | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/client/src/page-pos.html b/client/src/page-pos.html
index 9fe1df65a..5bff43e2c 100644
--- a/client/src/page-pos.html
+++ b/client/src/page-pos.html
@@ -222,7 +222,7 @@
                 <b>{{$round(customer.balance)}} [[app.settings.monetaryUnit]]</b>
               </template>
 
-              <paper-dropdown-menu class="full-width-paper-dropdown" label="[[verses.pos.paymentMethod]]" class="mr-4">
+              <paper-dropdown-menu class="full-width-paper-dropdown" label="[[verses.pos.paymentMethod]]" class="mr-4" on-iron-select="paymentMethodSelected">
                 <paper-listbox slot="dropdown-content" selected="{{payment.paymentMethod}}" attr-for-selected="name">
                   <paper-item name="cash">[[verses.general.cash]]</paper-item>
                   <paper-item name="card">[[verses.general.card]]</paper-item>
@@ -297,7 +297,7 @@
                 totalBilled: null,
                 previousCustomerBalance: null,
                 shouldSaveChangeInAccount: false,
-                paymentMethod: 'cash',
+                paymentMethod: 'card',
                 paidAmount: 0,
                 changeAmount: 0
               }
@@ -470,20 +470,20 @@
         console.log("paymentMethod: ", paymentMethod);
 
         // calculating change amount, paid amount depending on payment method
-        if(paymentMethod === 'cash') {          
+        if (paymentMethod === 'cash') {
           if (paidAmount > totalBilled) {
             changeAmount = paidAmount - totalBilled;
           } else {
             changeAmount = 0;
           }
         }
-        
-        if(paymentMethod === 'card' || paymentMethod === 'digital') {
+
+        if (paymentMethod === 'card' || paymentMethod === 'digital') {
           changeAmount = 0;
           paidAmount = totalBilled;
         }
 
-        if(paymentMethod === 'change-wallet') {
+        if (paymentMethod === 'change-wallet') {
           changeAmount = 0;
           paidAmount = 0;
         }
@@ -563,6 +563,15 @@
         })
       }
 
+      paymentMethodSelected(e) {
+        // NOTE: The timeout should not be necessary. However, without it
+        // the value of this.payment.paymentMethod is not being updated in time.
+        window.setTimeout(() => {
+          console.log('paymentMethodSelected', this.payment.paymentMethod);
+          this._calculatePayment();
+        }, 100);
+      }
+
       genericPaymentInputChanged(e) {
         this.enforceMinMaxOnPaperInput(e);
         this._calculatePayment();

From 7c052bf6794758ff2d55e1f7760e5267bf10c4cc Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Wed, 3 Oct 2018 20:35:00 +0600
Subject: [PATCH 04/74] client work done

---
 client/src/page-pos.html | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/client/src/page-pos.html b/client/src/page-pos.html
index 5bff43e2c..20529dbc8 100644
--- a/client/src/page-pos.html
+++ b/client/src/page-pos.html
@@ -233,10 +233,8 @@
                 </paper-listbox>
               </paper-dropdown-menu>
 
-              {{$json(payment.paymentMethod)}}
-
-              <template is="dom-if" if="[[isPaymentMethodCash(payment.paymentMethod)]]">
-                <paper-input class="payment--paidAmount" value="{{payment.paidAmount}}" on-input="genericPaymentInputChanged" on-change="genericPaymentInputChanged" type="number" required min="0" error-message="[[verses.pos.paidAmountInputError]]" label="[[verses.pos.paidAmountInput]]">
+              <template is="dom-if" if="[[!isPaymentMethodChangeWallet(payment.paymentMethod)]]">
+                <paper-input class="payment--paidAmount" value="{{payment.paidAmount}}" disabled="[[!isPaymentMethodCash(payment.paymentMethod)]]" on-input="genericPaymentInputChanged" on-change="genericPaymentInputChanged" type="number" required min="0" error-message="[[verses.pos.paidAmountInputError]]" label="[[verses.pos.paidAmountInput]]">
                   <div slot="suffix">[[app.settings.monetaryUnit]]</div>
                 </paper-input>
               </template>
@@ -297,7 +295,7 @@
                 totalBilled: null,
                 previousCustomerBalance: null,
                 shouldSaveChangeInAccount: false,
-                paymentMethod: 'card',
+                paymentMethod: 'cash',
                 paidAmount: 0,
                 changeAmount: 0
               }
@@ -453,22 +451,11 @@
           totalBilled += parseFloat(serviceChargeAmount);
         }
 
-        // considering customer presence
-        if (this.customer) {
-          previousCustomerBalance = this.customer.balance;
-        }
-
-        // calculating change amount
-        if (paidAmount) {
-          if (totalBilled > paidAmount) {
-            changeAmount = paidAmount - totalBilled;
-          } else {
-            changeAmount = paidAmount - totalBilled;
-          }
+        // setting the default paid amount equal to total billed
+        if (!paidAmount) {
+          paidAmount = totalBilled;
         }
 
-        console.log("paymentMethod: ", paymentMethod);
-
         // calculating change amount, paid amount depending on payment method
         if (paymentMethod === 'cash') {
           if (paidAmount > totalBilled) {
@@ -567,7 +554,6 @@
         // NOTE: The timeout should not be necessary. However, without it
         // the value of this.payment.paymentMethod is not being updated in time.
         window.setTimeout(() => {
-          console.log('paymentMethodSelected', this.payment.paymentMethod);
           this._calculatePayment();
         }, 100);
       }
@@ -594,6 +580,10 @@
         return (paymentMethod === 'cash');
       }
 
+      isPaymentMethodChangeWallet(paymentMethod) {
+        return (paymentMethod === 'change-wallet');
+      }
+
       // region: misc =================================
 
     }

From 749e8244ea743ad63bb082e977a2c4ebed8eeab3 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Wed, 3 Oct 2018 20:58:45 +0600
Subject: [PATCH 05/74] previousCustomerBalance removed

---
 client/src/page-pos.html                    | 3 ---
 client/src/page-report-sales.html           | 4 ----
 meta/api-docs/add-sales.md                  | 1 -
 meta/api-docs/edit-sales.md                 | 1 -
 meta/api-docs/get-sales-list.md             | 2 --
 meta/api-docs/get-sales.md                  | 1 -
 server/scripts/bulk.js                      | 1 -
 server/src/apis/add-sales.js                | 2 --
 server/src/collections/sales.js             | 1 -
 server/src/legacy-apis/__depr__add-sales.js | 1 -
 server/src/legacy-collections/sales.js      | 1 -
 server/test/lib.js                          | 2 --
 server/test/test-sales-apis.js              | 9 +--------
 server/test/test-sales-return-apis.js       | 2 --
 14 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/client/src/page-pos.html b/client/src/page-pos.html
index 20529dbc8..cbff3c752 100644
--- a/client/src/page-pos.html
+++ b/client/src/page-pos.html
@@ -293,7 +293,6 @@
                 discountedAmount: 0,
                 serviceChargeAmount: 0,
                 totalBilled: null,
-                previousCustomerBalance: null,
                 shouldSaveChangeInAccount: false,
                 paymentMethod: 'cash',
                 paidAmount: 0,
@@ -403,7 +402,6 @@
           discountedAmount,
           serviceChargeAmount,
           totalBilled,
-          previousCustomerBalance,
           shouldSaveChangeInAccount,
           paymentMethod,
           paidAmount,
@@ -484,7 +482,6 @@
           discountedAmount,
           serviceChargeAmount,
           totalBilled,
-          previousCustomerBalance,
           paidAmount,
           changeAmount,
           shouldSaveChangeInAccount,
diff --git a/client/src/page-report-sales.html b/client/src/page-report-sales.html
index 5de9e45da..042bc0366 100644
--- a/client/src/page-report-sales.html
+++ b/client/src/page-report-sales.html
@@ -214,10 +214,6 @@
                     <div class="description">
                       <strong>[[verses.salesReport.serviceCharge]]: </strong>[[$round(sales.payment.serviceChargeAmount)]]%</div>
                   </template>
-                  <template is="dom-if" if="[[sales.payment.previousCustomerBalance]]">
-                    <div class="description">
-                      <strong>[[verses.salesReport.previousBalance]]: </strong>[[$round(sales.payment.previousCustomerBalance)]] [[app.settings.monetaryUnit]]</div>
-                  </template>
                 </template>
               </div>
               <div class="description">[[$round(sales.payment.totalBilled)]] [[app.settings.monetaryUnit]]</div>
diff --git a/meta/api-docs/add-sales.md b/meta/api-docs/add-sales.md
index fca5b034d..f301cbc45 100644
--- a/meta/api-docs/add-sales.md
+++ b/meta/api-docs/add-sales.md
@@ -30,7 +30,6 @@ method: `POST`
     discountedAmount: Joi.number().max(999999999999999).required(),
     serviceChargeAmount: Joi.number().max(999999999999999).required(),
     totalBilled: Joi.number().max(999999999999999).required(),
-    previousCustomerBalance: Joi.number().max(999999999999999).allow(null).required(),
     paidAmount: Joi.number().max(999999999999999).required(),
     changeAmount: Joi.number().max(999999999999999).required(),
     shouldSaveChangeInAccount: Joi.boolean().required(),
diff --git a/meta/api-docs/edit-sales.md b/meta/api-docs/edit-sales.md
index 8738f5dc6..556f28b87 100644
--- a/meta/api-docs/edit-sales.md
+++ b/meta/api-docs/edit-sales.md
@@ -31,7 +31,6 @@ method: `POST`
     discountedAmount: Joi.number().max(999999999999999).required(),
     serviceChargeAmount: Joi.number().max(999999999999999).required(),
     totalBilled: Joi.number().max(999999999999999).required(),
-    previousCustomerBalance: Joi.number().max(999999999999999).allow(null).required(),
     paidAmount: Joi.number().max(999999999999999).required(),
     changeAmount: Joi.number().max(999999999999999).required()
   })
diff --git a/meta/api-docs/get-sales-list.md b/meta/api-docs/get-sales-list.md
index 27ae219a0..0ee18c734 100644
--- a/meta/api-docs/get-sales-list.md
+++ b/meta/api-docs/get-sales-list.md
@@ -72,7 +72,6 @@ Possible Error Codes:
         discountedAmount: Joi.number().max(999999999999999).required(),
         serviceChargeAmount: Joi.number().max(999999999999999).required(),
         totalBilled: Joi.number().max(999999999999999).required(),
-        previousCustomerBalance: Joi.number().max(999999999999999).required(),
         paidAmount: Joi.number().max(999999999999999).required(),
         changeAmount: Joi.number().max(999999999999999).required()
       }),
@@ -112,7 +111,6 @@ Possible Error Codes:
         discountedAmount: Joi.number().max(999999999999999).required(),
         serviceChargeAmount: Joi.number().max(999999999999999).required(),
         totalBilled: Joi.number().max(999999999999999).required(),
-        previousCustomerBalance: Joi.number().max(999999999999999).required(),
         paidAmount: Joi.number().max(999999999999999).required(),
         changeAmount: Joi.number().max(999999999999999).required()
       }),
diff --git a/meta/api-docs/get-sales.md b/meta/api-docs/get-sales.md
index 84c96aa02..9cd6e2da1 100644
--- a/meta/api-docs/get-sales.md
+++ b/meta/api-docs/get-sales.md
@@ -62,7 +62,6 @@ Possible Error Codes:
       discountedAmount: Joi.number().max(999999999999999).required(),
       serviceChargeAmount: Joi.number().max(999999999999999).required(),
       totalBilled: Joi.number().max(999999999999999).required(),
-      previousCustomerBalance: Joi.number().max(999999999999999).allow(null).required(),
       paidAmount: Joi.number().max(999999999999999).required(),
       changeAmount: Joi.number().max(999999999999999).required()
     }),
diff --git a/server/scripts/bulk.js b/server/scripts/bulk.js
index 685ecc4a6..9aad79447 100644
--- a/server/scripts/bulk.js
+++ b/server/scripts/bulk.js
@@ -277,7 +277,6 @@ const createSales = async ({ apiKey, outletId, productList }) => {
       discountedAmount: 0,
       serviceChargeAmount: 0,
       totalBilled: 0,
-      previousCustomerBalance: null,
       paidAmount: 1000000000,
       changeAmount: 0,
       shouldSaveChangeInAccount: false,
diff --git a/server/src/apis/add-sales.js b/server/src/apis/add-sales.js
index 4a5be8c92..b3209eb0d 100644
--- a/server/src/apis/add-sales.js
+++ b/server/src/apis/add-sales.js
@@ -35,8 +35,6 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin) {
         serviceChargeAmount: Joi.number().max(999999999999999).required(),
         totalBilled: Joi.number().max(999999999999999).required(),
         paidAmount: Joi.number().max(999999999999999).required(),
-        previousCustomerBalance: Joi.number().max(999999999999999).allow(null).required(),
-        paidAmount: Joi.number().max(999999999999999).required(),
         changeAmount: Joi.number().max(999999999999999).required(),
         shouldSaveChangeInAccount: Joi.boolean().required(),
         paymentMethod: Joi.string().valid('cash', 'card', 'digital').required()
diff --git a/server/src/collections/sales.js b/server/src/collections/sales.js
index 0ff3a90ac..7b7e040c3 100644
--- a/server/src/collections/sales.js
+++ b/server/src/collections/sales.js
@@ -31,7 +31,6 @@ exports.SalesCollection = class extends Collection {
         discountedAmount: Joi.number().max(999999999999999).required(),
         serviceChargeAmount: Joi.number().max(999999999999999).required(),
         totalBilled: Joi.number().max(999999999999999).required(),
-        previousCustomerBalance: Joi.number().max(999999999999999).allow(null).required(),
         paidAmount: Joi.number().max(999999999999999).required(),
         changeAmount: Joi.number().max(999999999999999).required(),
         shouldSaveChangeInAccount: Joi.boolean().required(),
diff --git a/server/src/legacy-apis/__depr__add-sales.js b/server/src/legacy-apis/__depr__add-sales.js
index ae4ca9426..ef39ac403 100644
--- a/server/src/legacy-apis/__depr__add-sales.js
+++ b/server/src/legacy-apis/__depr__add-sales.js
@@ -37,7 +37,6 @@ exports.AddSalesApi = class extends inventoryCommonMixin(customerCommonMixin(col
         serviceChargeAmount: Joi.number().max(999999999999999).required(),
         totalBilled: Joi.number().max(999999999999999).required(),
         paidAmount: Joi.number().max(999999999999999).required(),
-        previousCustomerBalance: Joi.number().max(999999999999999).allow(null).required(),
         paidAmount: Joi.number().max(999999999999999).required(),
         changeAmount: Joi.number().max(999999999999999).required(),
         shouldSaveChangeInAccount: Joi.boolean().required(),
diff --git a/server/src/legacy-collections/sales.js b/server/src/legacy-collections/sales.js
index 9da2c4eae..fd0e095bb 100644
--- a/server/src/legacy-collections/sales.js
+++ b/server/src/legacy-collections/sales.js
@@ -42,7 +42,6 @@ exports.SalesCollection = class extends LegacyCollection {
         discountedAmount: Joi.number().max(999999999999999).required(),
         serviceChargeAmount: Joi.number().max(999999999999999).required(),
         totalBilled: Joi.number().max(999999999999999).required(),
-        previousCustomerBalance: Joi.number().max(999999999999999).allow(null).required(),
         paidAmount: Joi.number().max(999999999999999).required(),
         changeAmount: Joi.number().max(999999999999999).required(),
         shouldSaveChangeInAccount: Joi.boolean().required(),
diff --git a/server/test/lib.js b/server/test/lib.js
index 6fc5a2da6..18f41718e 100644
--- a/server/test/lib.js
+++ b/server/test/lib.js
@@ -997,7 +997,6 @@ exports.validateSalesSchema = (doc) => {
       discountedAmount: Joi.number().max(999999999999999).required(),
       serviceChargeAmount: Joi.number().max(999999999999999).required(),
       totalBilled: Joi.number().max(999999999999999).required(),
-      previousCustomerBalance: Joi.number().max(999999999999999).allow(null).required(),
       paidAmount: Joi.number().max(999999999999999).required(),
       changeAmount: Joi.number().max(999999999999999).required(),
       shouldSaveChangeInAccount: Joi.boolean().required(),
@@ -1040,7 +1039,6 @@ exports.validateSalesSchemaWhenListObj = (doc) => {
       discountedAmount: Joi.number().max(999999999999999).required(),
       serviceChargeAmount: Joi.number().max(999999999999999).required(),
       totalBilled: Joi.number().max(999999999999999).required(),
-      previousCustomerBalance: Joi.number().max(999999999999999).allow(null).required(),
       paidAmount: Joi.number().max(999999999999999).required(),
       changeAmount: Joi.number().max(999999999999999).required(),
       shouldSaveChangeInAccount: Joi.boolean().required(),
diff --git a/server/test/test-sales-apis.js b/server/test/test-sales-apis.js
index 7e532bee1..95887a586 100644
--- a/server/test/test-sales-apis.js
+++ b/server/test/test-sales-apis.js
@@ -82,7 +82,7 @@ let fromDate = new Date();
 fromDate.setDate(fromDate.getDate() - 1);
 fromDate = fromDate.getTime();
 
-describe.only('Sales', _ => {
+describe('Sales', _ => {
 
   it('START', testDoneFn => {
     initializeServer(_ => {
@@ -210,7 +210,6 @@ describe.only('Sales', _ => {
           discountedAmount: ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)),
           serviceChargeAmount: 0,
           totalBilled: (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100))),
-          previousCustomerBalance: null,
           paidAmount: 300,
           changeAmount: (300 - (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100)))),
           shouldSaveChangeInAccount: false,
@@ -245,7 +244,6 @@ describe.only('Sales', _ => {
           discountedAmount: ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)),
           serviceChargeAmount: 0,
           totalBilled: (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100))),
-          previousCustomerBalance: null,
           paidAmount: 300,
           changeAmount: (300 - (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100)))),
           shouldSaveChangeInAccount: false,
@@ -288,7 +286,6 @@ describe.only('Sales', _ => {
           discountedAmount: ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)),
           serviceChargeAmount: 0,
           totalBilled: (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100))),
-          previousCustomerBalance: null,
           paidAmount: 300,
           changeAmount: (300 - (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100)))),
           shouldSaveChangeInAccount: false,
@@ -331,7 +328,6 @@ describe.only('Sales', _ => {
           discountedAmount: ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)),
           serviceChargeAmount: 0,
           totalBilled: (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100))),
-          previousCustomerBalance: null,
           paidAmount: 300,
           changeAmount: (300 - (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100)))),
           shouldSaveChangeInAccount: false,
@@ -373,7 +369,6 @@ describe.only('Sales', _ => {
           discountedAmount: ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)),
           serviceChargeAmount: 0,
           totalBilled: (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100))),
-          previousCustomerBalance: null,
           paidAmount: 0,
           changeAmount: (0 - (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100)))),
           shouldSaveChangeInAccount: false,
@@ -416,7 +411,6 @@ describe.only('Sales', _ => {
           discountedAmount: ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)),
           serviceChargeAmount: 0,
           totalBilled: (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100))),
-          previousCustomerBalance: customerData.balance,
           paidAmount: 300,
           changeAmount: (300 - (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100)))),
           shouldSaveChangeInAccount: false,
@@ -459,7 +453,6 @@ describe.only('Sales', _ => {
           discountedAmount: ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)),
           serviceChargeAmount: 0,
           totalBilled: (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100))),
-          previousCustomerBalance: customerData.balance,
           paidAmount: 300,
           changeAmount: (300 - (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100)))),
           shouldSaveChangeInAccount: false,
diff --git a/server/test/test-sales-return-apis.js b/server/test/test-sales-return-apis.js
index a58d290c4..f4e0fd64a 100644
--- a/server/test/test-sales-return-apis.js
+++ b/server/test/test-sales-return-apis.js
@@ -200,7 +200,6 @@ describe('Sales Return', _ => {
                                   discountedAmount: ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)),
                                   serviceChargeAmount: 0,
                                   totalBilled: (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100))),
-                                  previousCustomerBalance: customerData.balance,
                                   paidAmount: 300,
                                   changeAmount: (300 - (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100)))),
                                   shouldSaveChangeInAccount: false,
@@ -229,7 +228,6 @@ describe('Sales Return', _ => {
                                     discountedAmount: ((outletInventoryMatchingProductCategoryList[1].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[1].defaultDiscountValue / 100)),
                                     serviceChargeAmount: 0,
                                     totalBilled: (outletInventoryMatchingProductCategoryList[1].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[1].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[1].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[1].defaultSalePrice * 2) * (5 / 100))),
-                                    previousCustomerBalance: customerData.balance,
                                     paidAmount: 300,
                                     changeAmount: (300 - (outletInventoryMatchingProductCategoryList[1].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[1].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[1].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[1].defaultSalePrice * 2) * (5 / 100)))),
                                     shouldSaveChangeInAccount: false,

From b7108abc10176ddb596da7baf4e15e90b6d09123 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Wed, 3 Oct 2018 21:00:11 +0600
Subject: [PATCH 06/74] sales return fixed

---
 server/src/legacy-apis/add-sales-return.js | 18 ------------------
 server/test/test-sales-return-apis.js      |  2 +-
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/server/src/legacy-apis/add-sales-return.js b/server/src/legacy-apis/add-sales-return.js
index 270f10539..6fa1b92ea 100644
--- a/server/src/legacy-apis/add-sales-return.js
+++ b/server/src/legacy-apis/add-sales-return.js
@@ -95,30 +95,12 @@ exports.AddSalesReturnApi = class extends salesCommonMixin(inventoryCommonMixin(
     });
   }
 
-  _handlePayback({ payment, customer }, cbfn) {
-    // TODO: will handle customer payback here in the future
-  }
-
   _addSalesReturn({ salesId, returnedProductList, creditedAmount }, cbfn) {
     this.legacyDatabase.salesReturn.create({ salesId, returnedProductList, creditedAmount }, (err, salesReturnId) => {
       return cbfn(salesReturnId);
     })
   }
 
-  // below are copied code
-
-  _handlePayment(payment, customer, cbfn) {
-    let diff = (payment.paidAmount + payment.previousCustomerBalance) - payment.totalBilled;
-    payment.changeAmount = diff;
-    if (diff >= 0) {
-      return cbfn(payment);
-    } else {
-      this._updateCustomerBalance(diff, customer, () => {
-        return cbfn(payment);
-      });
-    }
-  }
-
   handle({ body }) {
     let { salesId, returnedProductList, creditedAmount } = body;
 
diff --git a/server/test/test-sales-return-apis.js b/server/test/test-sales-return-apis.js
index f4e0fd64a..388c2ed60 100644
--- a/server/test/test-sales-return-apis.js
+++ b/server/test/test-sales-return-apis.js
@@ -87,7 +87,7 @@ let fromDate = new Date();
 fromDate.setDate(fromDate.getDate() - 1);
 fromDate = fromDate.getTime();
 
-describe('Sales Return', _ => {
+describe.only('Sales Return', _ => {
 
   it('START', testDoneFn => {
     initializeServer(_ => {

From e1fbeeb4921a543cbd6094ff951e69d8e4b1fca1 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Wed, 3 Oct 2018 21:00:24 +0600
Subject: [PATCH 07/74] all tests running

---
 server/test/test-sales-return-apis.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/test/test-sales-return-apis.js b/server/test/test-sales-return-apis.js
index 388c2ed60..f4e0fd64a 100644
--- a/server/test/test-sales-return-apis.js
+++ b/server/test/test-sales-return-apis.js
@@ -87,7 +87,7 @@ let fromDate = new Date();
 fromDate.setDate(fromDate.getDate() - 1);
 fromDate = fromDate.getTime();
 
-describe.only('Sales Return', _ => {
+describe('Sales Return', _ => {
 
   it('START', testDoneFn => {
     initializeServer(_ => {

From 58b60102f9108440f870f7404b287531c2ee9863 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Wed, 3 Oct 2018 21:11:40 +0600
Subject: [PATCH 08/74] client is ready

---
 client/src/page-pos.html                    | 46 ++++++++-------------
 server/src/apis/add-sales.js                |  2 +-
 server/src/collections/sales.js             |  2 +-
 server/src/legacy-apis/__depr__add-sales.js |  2 +-
 server/src/legacy-collections/sales.js      |  2 +-
 5 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/client/src/page-pos.html b/client/src/page-pos.html
index cbff3c752..16f765072 100644
--- a/client/src/page-pos.html
+++ b/client/src/page-pos.html
@@ -217,11 +217,6 @@
 
             <div class="individual-calculation-field-container">
 
-              <template is="dom-if" if="[[customer]]">
-                [[verses.pos.previousCustomerBalance]]:
-                <b>{{$round(customer.balance)}} [[app.settings.monetaryUnit]]</b>
-              </template>
-
               <paper-dropdown-menu class="full-width-paper-dropdown" label="[[verses.pos.paymentMethod]]" class="mr-4" on-iron-select="paymentMethodSelected">
                 <paper-listbox slot="dropdown-content" selected="{{payment.paymentMethod}}" attr-for-selected="name">
                   <paper-item name="cash">[[verses.general.cash]]</paper-item>
@@ -234,26 +229,26 @@
               </paper-dropdown-menu>
 
               <template is="dom-if" if="[[!isPaymentMethodChangeWallet(payment.paymentMethod)]]">
-                <paper-input class="payment--paidAmount" value="{{payment.paidAmount}}" disabled="[[!isPaymentMethodCash(payment.paymentMethod)]]" on-input="genericPaymentInputChanged" on-change="genericPaymentInputChanged" type="number" required min="0" error-message="[[verses.pos.paidAmountInputError]]" label="[[verses.pos.paidAmountInput]]">
+                <paper-input class="payment--paidAmount" value="{{payment.paidAmount}}" on-input="genericPaymentInputChanged" on-change="genericPaymentInputChanged" type="number" required min="0" error-message="[[verses.pos.paidAmountInputError]]" label="[[verses.pos.paidAmountInput]]">
                   <div slot="suffix">[[app.settings.monetaryUnit]]</div>
                 </paper-input>
               </template>
 
-              <template is="dom-if" if="[[isPaymentMethodCash(payment.paymentMethod)]]">
-                <template is="dom-if" if="[[payment.changeAmount]]">
-                  <br> [[verses.pos.changeAmount]]:
-                  <b>{{$round(payment.changeAmount)}} [[app.settings.monetaryUnit]]</b>
-
-                  <br>
-                  <template is="dom-if" if="[[customer]]">
-                    <template is="dom-if" if="[[payment.changeAmount]]">
-                      <paper-checkbox checked="{{payment.shouldSaveChangeInAccount}}">
-                        [[verses.pos.shouldSaveChangeInAccount]]
-                      </paper-checkbox>
-                    </template>
+              
+              <template is="dom-if" if="[[payment.changeAmount]]">
+                <br> [[verses.pos.changeAmount]]:
+                <b>{{$round(payment.changeAmount)}} [[app.settings.monetaryUnit]]</b>
+
+                <br>
+                <template is="dom-if" if="[[customer]]">
+                  <template is="dom-if" if="[[payment.changeAmount]]">
+                    <paper-checkbox checked="{{payment.shouldSaveChangeInAccount}}">
+                      [[verses.pos.shouldSaveChangeInAccount]]
+                    </paper-checkbox>
                   </template>
                 </template>
               </template>
+              
 
             </div>
 
@@ -455,7 +450,10 @@
         }
 
         // calculating change amount, paid amount depending on payment method
-        if (paymentMethod === 'cash') {
+        if (paymentMethod === 'change-wallet') {
+          changeAmount = 0;
+          paidAmount = 0;
+        } else {
           if (paidAmount > totalBilled) {
             changeAmount = paidAmount - totalBilled;
           } else {
@@ -463,16 +461,6 @@
           }
         }
 
-        if (paymentMethod === 'card' || paymentMethod === 'digital') {
-          changeAmount = 0;
-          paidAmount = totalBilled;
-        }
-
-        if (paymentMethod === 'change-wallet') {
-          changeAmount = 0;
-          paidAmount = 0;
-        }
-
         // returning updated payment info
         this.payment = {
           totalAmount,
diff --git a/server/src/apis/add-sales.js b/server/src/apis/add-sales.js
index b3209eb0d..0c534fbeb 100644
--- a/server/src/apis/add-sales.js
+++ b/server/src/apis/add-sales.js
@@ -37,7 +37,7 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin) {
         paidAmount: Joi.number().max(999999999999999).required(),
         changeAmount: Joi.number().max(999999999999999).required(),
         shouldSaveChangeInAccount: Joi.boolean().required(),
-        paymentMethod: Joi.string().valid('cash', 'card', 'digital').required()
+        paymentMethod: Joi.string().valid('cash', 'card', 'digital', 'change-wallet').required()
       })
 
     });
diff --git a/server/src/collections/sales.js b/server/src/collections/sales.js
index 7b7e040c3..f371a275b 100644
--- a/server/src/collections/sales.js
+++ b/server/src/collections/sales.js
@@ -34,7 +34,7 @@ exports.SalesCollection = class extends Collection {
         paidAmount: Joi.number().max(999999999999999).required(),
         changeAmount: Joi.number().max(999999999999999).required(),
         shouldSaveChangeInAccount: Joi.boolean().required(),
-        paymentMethod: Joi.string().valid('cash', 'card', 'digital').required()
+        paymentMethod: Joi.string().valid('cash', 'card', 'digital', 'change-wallet').required()
       }),
       isModified: Joi.boolean().required(),
       isDeleted: Joi.boolean().required(),
diff --git a/server/src/legacy-apis/__depr__add-sales.js b/server/src/legacy-apis/__depr__add-sales.js
index ef39ac403..1f9d44fbd 100644
--- a/server/src/legacy-apis/__depr__add-sales.js
+++ b/server/src/legacy-apis/__depr__add-sales.js
@@ -40,7 +40,7 @@ exports.AddSalesApi = class extends inventoryCommonMixin(customerCommonMixin(col
         paidAmount: Joi.number().max(999999999999999).required(),
         changeAmount: Joi.number().max(999999999999999).required(),
         shouldSaveChangeInAccount: Joi.boolean().required(),
-        paymentMethod: Joi.string().valid('cash', 'card', 'digital').required()
+        paymentMethod: Joi.string().valid('cash', 'card', 'digital', 'change-wallet').required()
       })
     });
   }
diff --git a/server/src/legacy-collections/sales.js b/server/src/legacy-collections/sales.js
index fd0e095bb..6f46e2f61 100644
--- a/server/src/legacy-collections/sales.js
+++ b/server/src/legacy-collections/sales.js
@@ -45,7 +45,7 @@ exports.SalesCollection = class extends LegacyCollection {
         paidAmount: Joi.number().max(999999999999999).required(),
         changeAmount: Joi.number().max(999999999999999).required(),
         shouldSaveChangeInAccount: Joi.boolean().required(),
-        paymentMethod: Joi.string().valid('cash', 'card', 'digital').required()
+        paymentMethod: Joi.string().valid('cash', 'card', 'digital', 'change-wallet').required()
       }),
       isModified: Joi.boolean().required(),
       isDeleted: Joi.boolean().required(),

From 184c82f5134a7d46e3a60eb8c4eb0d47aab460c9 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Thu, 4 Oct 2018 11:17:12 +0600
Subject: [PATCH 09/74] add sales api methods better name

---
 server/src/apis/add-sales.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/src/apis/add-sales.js b/server/src/apis/add-sales.js
index 0c534fbeb..77a1d9b83 100644
--- a/server/src/apis/add-sales.js
+++ b/server/src/apis/add-sales.js
@@ -59,7 +59,7 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin) {
     }];
   }
 
-  _sell({ outletDefaultInventory, productList }) {
+  _reduceProductCountFromOutletDefaultInventory({ outletDefaultInventory, productList }) {
     for (let product of productList) {
       let foundProduct = outletDefaultInventory.productList.find(_product => _product.productId === product.productId);
       if (!foundProduct) {
@@ -72,7 +72,7 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin) {
     }
   }
 
-  async _handlePayment({ payment, customer }) {
+  async _handleReceivedPayment({ payment, customer }) {
     if (payment.totalBilled > payment.paidAmount) {
       if (customer) {
         await this._adjustCustomerBalanceAndSave({ customer, action: 'withdrawl', amount: (payment.totalBilled - payment.paidAmount) });
@@ -119,8 +119,8 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin) {
     }
 
     let outletDefaultInventory = await this.__getOutletDefaultInventory({ outletId });
-    this._sell({ outletDefaultInventory, productList });
-    await this._handlePayment({ payment, customer });
+    this._reduceProductCountFromOutletDefaultInventory({ outletDefaultInventory, productList });
+    await this._handleReceivedPayment({ payment, customer });
     await this.database.inventory.setProductList({ id: outletDefaultInventory.id }, { productList: outletDefaultInventory.productList });
     let salesId = await this.database.sales.create({ outletId, customerId, productList, payment });
 

From 8076131d302f763b2ec40260165802362939af59 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Thu, 4 Oct 2018 15:15:37 +0600
Subject: [PATCH 10/74] base ready

---
 server/src/apis/add-sales.js    | 48 ++++++++++++++++++++++++++++++---
 server/src/collections/sales.js | 23 +++++++++++-----
 server/test/test-sales-apis.js  |  3 ++-
 3 files changed, 63 insertions(+), 11 deletions(-)

diff --git a/server/src/apis/add-sales.js b/server/src/apis/add-sales.js
index 77a1d9b83..09112e73b 100644
--- a/server/src/apis/add-sales.js
+++ b/server/src/apis/add-sales.js
@@ -72,7 +72,7 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin) {
     }
   }
 
-  async _handleReceivedPayment({ payment, customer }) {
+  async depr_handleReceivedPayment({ payment, customer }) {
     if (payment.totalBilled > payment.paidAmount) {
       if (customer) {
         await this._adjustCustomerBalanceAndSave({ customer, action: 'withdrawl', amount: (payment.totalBilled - payment.paidAmount) });
@@ -96,6 +96,45 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin) {
     }
   }
 
+  async _handleReceivedPayment({ userId, payment, customer }) {
+    let paymentList = [
+      {
+        createdDatetimeStamp: (new Date).getTime(),
+        acceptedByUserId: userId,
+
+        paidAmount: payment.paidAmount,
+        changeAmount: payment.changeAmount,
+        paymentMethod: payment.paymentMethod,
+        wasChangeSavedInChangeWallet: false
+      }
+    ];
+
+    if (payment.totalBilled > payment.paidAmount) {
+      // console.log("payment.totalBilled > payment.paidAmount");
+      if (customer) {
+        await this._adjustCustomerBalanceAndSave({ customer, action: 'withdrawl', amount: (payment.totalBilled - payment.paidAmount) });
+      } else {
+        throw new CodedError("CREDIT_SALE_NOT_ALLOWED_WITHOUT_CUSTOMER", "credit sale is not allowed without registered cutomer");
+      }
+    }
+
+    if (payment.totalBilled === payment.paidAmount) {
+      // console.log("payment.totalBilled === payment.paidAmount");
+    }
+
+    if (payment.totalBilled < payment.paidAmount) {
+      // console.log("payment.totalBilled < payment.paidAmount");
+      if (customer && payment.shouldSaveChangeInAccount) {
+        paymentList[0].wasChangeSavedInChangeWallet = true;
+
+        await this._adjustCustomerBalanceAndSave({ customer, action: 'payment', amount: (payment.totalBilled - payment.paidAmount) });
+      }
+    }
+
+    let { totalAmount, vatAmount, discountType, discountValue, discountedAmount, serviceChargeAmount, totalBilled } = payment;
+    return { totalAmount, vatAmount, discountType, discountValue, discountedAmount, serviceChargeAmount, totalBilled, totalPaidAmount: paymentList[0].paidAmount, paymentList};
+  }
+
   async _adjustCustomerBalanceAndSave({ customer, action, amount }) {
     if (action === 'payment') {
       customer.balance += amount;
@@ -107,7 +146,7 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin) {
     return;
   }
 
-  async handle({ body }) {
+  async handle({ userId, body }) {
     let { outletId, customerId, productList, payment } = body;
     
     let customer = null;
@@ -120,9 +159,10 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin) {
 
     let outletDefaultInventory = await this.__getOutletDefaultInventory({ outletId });
     this._reduceProductCountFromOutletDefaultInventory({ outletDefaultInventory, productList });
-    await this._handleReceivedPayment({ payment, customer });
+    let standardizedPayment = await this._handleReceivedPayment({ userId, payment, customer });
+    // console.log("standardizedPayment: ", standardizedPayment);
     await this.database.inventory.setProductList({ id: outletDefaultInventory.id }, { productList: outletDefaultInventory.productList });
-    let salesId = await this.database.sales.create({ outletId, customerId, productList, payment });
+    let salesId = await this.database.sales.create({ outletId, customerId, productList, payment: standardizedPayment });
 
     return { status: "success", salesId };
   }
diff --git a/server/src/collections/sales.js b/server/src/collections/sales.js
index f371a275b..9874c7923 100644
--- a/server/src/collections/sales.js
+++ b/server/src/collections/sales.js
@@ -13,8 +13,8 @@ exports.SalesCollection = class extends Collection {
       lastModifiedByUserId: Joi.number().max(999999999999999).allow(null).required(),
       outletId: Joi.number().max(999999999999999).required(),
       customerId: Joi.number().max(999999999999999).allow(null).required(),
-      // FIXME: productList does not need min
-      productList: Joi.array().required().min(1).items(
+
+      productList: Joi.array().required().items(
         Joi.object().keys({
           productId: Joi.number().max(999999999999999).required(),
           count: Joi.number().max(999999999999999).required(),
@@ -23,6 +23,7 @@ exports.SalesCollection = class extends Collection {
           salePrice: Joi.number().max(999999999999999).required()
         })
       ),
+
       payment: Joi.object().keys({
         totalAmount: Joi.number().max(999999999999999).required(),
         vatAmount: Joi.number().max(999999999999999).required(),
@@ -31,11 +32,21 @@ exports.SalesCollection = class extends Collection {
         discountedAmount: Joi.number().max(999999999999999).required(),
         serviceChargeAmount: Joi.number().max(999999999999999).required(),
         totalBilled: Joi.number().max(999999999999999).required(),
-        paidAmount: Joi.number().max(999999999999999).required(),
-        changeAmount: Joi.number().max(999999999999999).required(),
-        shouldSaveChangeInAccount: Joi.boolean().required(),
-        paymentMethod: Joi.string().valid('cash', 'card', 'digital', 'change-wallet').required()
+    
+        totalPaidAmount: Joi.number().max(999999999999999).required(),
+        paymentList: Joi.array().required().items(
+          Joi.object().keys({
+            createdDatetimeStamp: Joi.number().max(999999999999999).required(),
+            acceptedByUserId: Joi.number().max(999999999999999).required(),
+    
+            paidAmount: Joi.number().max(999999999999999).required(),
+            changeAmount: Joi.number().max(999999999999999).required(),
+            paymentMethod: Joi.string().valid('cash', 'card', 'digital', 'change-wallet').required(),
+            wasChangeSavedInChangeWallet: Joi.boolean().required()   
+          })
+        )
       }),
+
       isModified: Joi.boolean().required(),
       isDeleted: Joi.boolean().required(),
       isDiscarded: Joi.boolean().required()
diff --git a/server/test/test-sales-apis.js b/server/test/test-sales-apis.js
index 95887a586..53e8a5f38 100644
--- a/server/test/test-sales-apis.js
+++ b/server/test/test-sales-apis.js
@@ -82,7 +82,7 @@ let fromDate = new Date();
 fromDate.setDate(fromDate.getDate() - 1);
 fromDate = fromDate.getTime();
 
-describe('Sales', _ => {
+describe.only('Sales', _ => {
 
   it('START', testDoneFn => {
     initializeServer(_ => {
@@ -335,6 +335,7 @@ describe('Sales', _ => {
         }
       }
     }, (err, response, body) => {
+      console.log(body);
       expect(response.statusCode).to.equal(200);
       validateAddSalesApiSuccessResponse(body);
       testDoneFn();

From 1de9aec6d9792dc691d6aa6280a831a7a2c2f3bf Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Thu, 4 Oct 2018 15:18:26 +0600
Subject: [PATCH 11/74] lib work done

---
 server/test/lib.js             | 36 ++++++++++++++++++++++++++--------
 server/test/test-sales-apis.js |  2 +-
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/server/test/lib.js b/server/test/lib.js
index 18f41718e..a8d146543 100644
--- a/server/test/lib.js
+++ b/server/test/lib.js
@@ -989,6 +989,7 @@ exports.validateSalesSchema = (doc) => {
         salePrice: Joi.number().max(999999999999999).required()
       })
     ),
+
     payment: Joi.object().keys({
       totalAmount: Joi.number().max(999999999999999).required(),
       vatAmount: Joi.number().max(999999999999999).required(),
@@ -997,10 +998,19 @@ exports.validateSalesSchema = (doc) => {
       discountedAmount: Joi.number().max(999999999999999).required(),
       serviceChargeAmount: Joi.number().max(999999999999999).required(),
       totalBilled: Joi.number().max(999999999999999).required(),
-      paidAmount: Joi.number().max(999999999999999).required(),
-      changeAmount: Joi.number().max(999999999999999).required(),
-      shouldSaveChangeInAccount: Joi.boolean().required(),
-      paymentMethod: Joi.string().valid('cash', 'card', 'digital').required()
+  
+      totalPaidAmount: Joi.number().max(999999999999999).required(),
+      paymentList: Joi.array().required().items(
+        Joi.object().keys({
+          createdDatetimeStamp: Joi.number().max(999999999999999).required(),
+          acceptedByUserId: Joi.number().max(999999999999999).required(),
+  
+          paidAmount: Joi.number().max(999999999999999).required(),
+          changeAmount: Joi.number().max(999999999999999).required(),
+          paymentMethod: Joi.string().valid('cash', 'card', 'digital', 'change-wallet').required(),
+          wasChangeSavedInChangeWallet: Joi.boolean().required()   
+        })
+      )
     }),
 
     isModified: Joi.boolean().required(),
@@ -1031,6 +1041,7 @@ exports.validateSalesSchemaWhenListObj = (doc) => {
         salePrice: Joi.number().max(999999999999999).required()
       })
     ),
+
     payment: Joi.object().keys({
       totalAmount: Joi.number().max(999999999999999).required(),
       vatAmount: Joi.number().max(999999999999999).required(),
@@ -1039,10 +1050,19 @@ exports.validateSalesSchemaWhenListObj = (doc) => {
       discountedAmount: Joi.number().max(999999999999999).required(),
       serviceChargeAmount: Joi.number().max(999999999999999).required(),
       totalBilled: Joi.number().max(999999999999999).required(),
-      paidAmount: Joi.number().max(999999999999999).required(),
-      changeAmount: Joi.number().max(999999999999999).required(),
-      shouldSaveChangeInAccount: Joi.boolean().required(),
-      paymentMethod: Joi.string().valid('cash', 'card', 'digital').required()
+  
+      totalPaidAmount: Joi.number().max(999999999999999).required(),
+      paymentList: Joi.array().required().items(
+        Joi.object().keys({
+          createdDatetimeStamp: Joi.number().max(999999999999999).required(),
+          acceptedByUserId: Joi.number().max(999999999999999).required(),
+  
+          paidAmount: Joi.number().max(999999999999999).required(),
+          changeAmount: Joi.number().max(999999999999999).required(),
+          paymentMethod: Joi.string().valid('cash', 'card', 'digital', 'change-wallet').required(),
+          wasChangeSavedInChangeWallet: Joi.boolean().required()   
+        })
+      )
     }),
 
     isModified: Joi.boolean().required(),
diff --git a/server/test/test-sales-apis.js b/server/test/test-sales-apis.js
index 53e8a5f38..d77cc95d1 100644
--- a/server/test/test-sales-apis.js
+++ b/server/test/test-sales-apis.js
@@ -335,7 +335,6 @@ describe.only('Sales', _ => {
         }
       }
     }, (err, response, body) => {
-      console.log(body);
       expect(response.statusCode).to.equal(200);
       validateAddSalesApiSuccessResponse(body);
       testDoneFn();
@@ -791,6 +790,7 @@ describe.only('Sales', _ => {
         salesId,
       }
     }, (err, response, body) => {
+      console.log(body);
       expect(response.statusCode).to.equal(200);
       validateGenericApiSuccessResponse(body);
       testDoneFn();

From 0603564b03100d0c97d930e767e524e0c77c4f9a Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Thu, 4 Oct 2018 15:22:01 +0600
Subject: [PATCH 12/74] all tests passing

---
 server/src/legacy-collections/sales.js | 22 +++++++++++++++++-----
 server/test/test-sales-apis.js         |  3 +--
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/server/src/legacy-collections/sales.js b/server/src/legacy-collections/sales.js
index 6f46e2f61..3da1fc262 100644
--- a/server/src/legacy-collections/sales.js
+++ b/server/src/legacy-collections/sales.js
@@ -25,7 +25,8 @@ exports.SalesCollection = class extends LegacyCollection {
       lastModifiedByUserId: Joi.number().max(999999999999999).allow(null).required(),
       outletId: Joi.number().max(999999999999999).required(),
       customerId: Joi.number().max(999999999999999).allow(null).required(),
-      productList: Joi.array().required().min(1).items(
+
+      productList: Joi.array().required().items(
         Joi.object().keys({
           productId: Joi.number().max(999999999999999).required(),
           count: Joi.number().max(999999999999999).required(),
@@ -34,6 +35,7 @@ exports.SalesCollection = class extends LegacyCollection {
           salePrice: Joi.number().max(999999999999999).required()
         })
       ),
+
       payment: Joi.object().keys({
         totalAmount: Joi.number().max(999999999999999).required(),
         vatAmount: Joi.number().max(999999999999999).required(),
@@ -42,11 +44,21 @@ exports.SalesCollection = class extends LegacyCollection {
         discountedAmount: Joi.number().max(999999999999999).required(),
         serviceChargeAmount: Joi.number().max(999999999999999).required(),
         totalBilled: Joi.number().max(999999999999999).required(),
-        paidAmount: Joi.number().max(999999999999999).required(),
-        changeAmount: Joi.number().max(999999999999999).required(),
-        shouldSaveChangeInAccount: Joi.boolean().required(),
-        paymentMethod: Joi.string().valid('cash', 'card', 'digital', 'change-wallet').required()
+    
+        totalPaidAmount: Joi.number().max(999999999999999).required(),
+        paymentList: Joi.array().required().items(
+          Joi.object().keys({
+            createdDatetimeStamp: Joi.number().max(999999999999999).required(),
+            acceptedByUserId: Joi.number().max(999999999999999).required(),
+    
+            paidAmount: Joi.number().max(999999999999999).required(),
+            changeAmount: Joi.number().max(999999999999999).required(),
+            paymentMethod: Joi.string().valid('cash', 'card', 'digital', 'change-wallet').required(),
+            wasChangeSavedInChangeWallet: Joi.boolean().required()   
+          })
+        )
       }),
+
       isModified: Joi.boolean().required(),
       isDeleted: Joi.boolean().required(),
       isDiscarded: Joi.boolean().required()
diff --git a/server/test/test-sales-apis.js b/server/test/test-sales-apis.js
index d77cc95d1..95887a586 100644
--- a/server/test/test-sales-apis.js
+++ b/server/test/test-sales-apis.js
@@ -82,7 +82,7 @@ let fromDate = new Date();
 fromDate.setDate(fromDate.getDate() - 1);
 fromDate = fromDate.getTime();
 
-describe.only('Sales', _ => {
+describe('Sales', _ => {
 
   it('START', testDoneFn => {
     initializeServer(_ => {
@@ -790,7 +790,6 @@ describe.only('Sales', _ => {
         salesId,
       }
     }, (err, response, body) => {
-      console.log(body);
       expect(response.statusCode).to.equal(200);
       validateGenericApiSuccessResponse(body);
       testDoneFn();

From c3cfba0d33e45b3969a6be7164f769908b026caf Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Thu, 4 Oct 2018 19:12:41 +0600
Subject: [PATCH 13/74] customer updated

---
 meta/api-docs/add-customer.md                 | 13 ++---
 meta/api-docs/adjust-customer-balance.md      |  4 ++
 server/src/collections/customer.js            | 27 +++++----
 server/src/legacy-apis/add-customer.js        | 11 ++--
 .../legacy-apis/adjust-customer-balance.js    |  2 +
 server/src/legacy-collections/customer.js     | 25 ++++----
 server/test/lib.js                            | 12 ++--
 server/test/test-customer-apis.js             | 58 +++++--------------
 8 files changed, 62 insertions(+), 90 deletions(-)

diff --git a/meta/api-docs/add-customer.md b/meta/api-docs/add-customer.md
index 62d24ee20..7d1db7f7c 100644
--- a/meta/api-docs/add-customer.md
+++ b/meta/api-docs/add-customer.md
@@ -11,16 +11,15 @@ method: `POST`
   organizationId: Joi.number().max(999999999999999).required(),
 
   fullName: Joi.string().min(1).max(64).required(),
-  phone: Joi.string().regex(/^[a-z0-9\+]*$/i).min(11).max(15).required(),
-  openingBalance: Joi.number().max(999999999999999).required()
+  phone: Joi.string().regex(/^[a-z0-9\+]*$/i).min(11).max(15).required()
 }
 ```
 
 ### response (on error):
 ```js
 {
-  "hasError": true,
-  "error": {
+  hasError: true,
+  error: {
     code,
     message
   }
@@ -38,9 +37,9 @@ Possible Error Codes:
 ### response (on success):
 ```js
 {
-  "hasError": false,
-  "status": "success",
-  "customerId": Joi.number().max(999999999999999).required()
+  hasError: false,
+  status: success,
+  customerId: Joi.number().max(999999999999999).required()
 }
 ```
 
diff --git a/meta/api-docs/adjust-customer-balance.md b/meta/api-docs/adjust-customer-balance.md
index c6d9791ac..c778ea567 100644
--- a/meta/api-docs/adjust-customer-balance.md
+++ b/meta/api-docs/adjust-customer-balance.md
@@ -4,6 +4,10 @@ url: `api/adjust-customer-balance`
 
 method: `POST`
 
+# WARNING! API DISABLED!
+
+This API has been disabled.
+
 ### request: 
 ```js
 {
diff --git a/server/src/collections/customer.js b/server/src/collections/customer.js
index 0d11de937..e22a37a72 100644
--- a/server/src/collections/customer.js
+++ b/server/src/collections/customer.js
@@ -8,22 +8,24 @@ exports.CustomerCollection = class extends Collection {
 
   get joiSchema() {
     return Joi.object().keys({
+      
       createdDatetimeStamp: Joi.number().max(999999999999999).required(),
       lastModifiedDatetimeStamp: Joi.number().max(999999999999999).required(),
+      isDeleted: Joi.boolean().required(),
+
       fullName: Joi.string().min(1).max(64).required(),
       phone: Joi.string().regex(/^[a-z0-9\+]*$/i).min(11).max(15).required(),
       organizationId: Joi.number().max(999999999999999).required(),
-      balance: Joi.number().max(999999999999999).required(),
-      isDeleted: Joi.boolean().required(),
+      changeWalletBalance: Joi.number().max(999999999999999).required(),
 
-      additionalPaymentHistory: Joi.array().items(
+      withdrawalHistory: Joi.array().items(
         Joi.object().keys({
           creditedDatetimeStamp: Joi.number().max(999999999999999).required(),
-          acceptedByUserId: Joi.number().max(999999999999999).allow(null).required(),
-          amount: Joi.number().max(999999999999999).required(),
-          action: Joi.string().valid('payment', 'withdrawl').required()
+          byUserId: Joi.number().max(999999999999999).required(),
+          amount: Joi.number().max(999999999999999).required()
         })
       )
+
     });
   }
 
@@ -48,20 +50,15 @@ exports.CustomerCollection = class extends Collection {
 
   get deletionIndicatorKey() { return 'isDeleted'; }
 
-  async create({ organizationId, fullName, phone, openingBalance, acceptedByUserId }) {
+  async create({ organizationId, fullName, phone }) {
     return await this._insert({
       createdDatetimeStamp: (new Date).getTime(),
       lastModifiedDatetimeStamp: (new Date).getTime(),
       fullName,
       organizationId,
       phone,
-      balance: openingBalance,
-      additionalPaymentHistory: [{
-        creditedDatetimeStamp: (new Date).getTime(),
-        acceptedByUserId,
-        amount: openingBalance,
-        action: 'payment'
-      }],
+      changeWalletBalance: 0,
+      withdrawalHistory: [],
       isDeleted: false
     });
   }
@@ -74,6 +71,7 @@ exports.CustomerCollection = class extends Collection {
     });
   }
 
+  // TODO: this should set withdrawalHistory
   async setAdditionalPaymentHistory({ id }, { additionalPaymentHistory }) {
     return await this._update({ id }, {
       $set: {
@@ -82,6 +80,7 @@ exports.CustomerCollection = class extends Collection {
     });
   }
 
+  // TODO: this should set changeWalletBalance
   async setBalance({ id }, { balance }) {
     return await this._update({ id }, {
       $set: {
diff --git a/server/src/legacy-apis/add-customer.js b/server/src/legacy-apis/add-customer.js
index 69e6733bf..940c879b9 100644
--- a/server/src/legacy-apis/add-customer.js
+++ b/server/src/legacy-apis/add-customer.js
@@ -13,8 +13,7 @@ exports.AddCustomerApi = class extends LegacyApi {
       organizationId: Joi.number().max(999999999999999).required(),
 
       fullName: Joi.string().min(1).max(64).required(),
-      phone: Joi.string().regex(/^[a-z0-9\+]*$/i).min(11).max(15).required(),
-      openingBalance: Joi.number().max(999999999999999).required()
+      phone: Joi.string().regex(/^[a-z0-9\+]*$/i).min(11).max(15).required()
     });
   }
 
@@ -27,9 +26,9 @@ exports.AddCustomerApi = class extends LegacyApi {
     }];
   }
 
-  _createCustomer({ organizationId, fullName, phone, openingBalance, acceptedByUserId }, cbfn) {
+  _createCustomer({ organizationId, fullName, phone }, cbfn) {
     let customer = {
-      organizationId, fullName, phone, openingBalance, acceptedByUserId
+      organizationId, fullName, phone
     }
     this.legacyDatabase.customer.create(customer, (err, customerId) => {
       if (err) return this.fail(err);
@@ -38,8 +37,8 @@ exports.AddCustomerApi = class extends LegacyApi {
   }
 
   handle({ body, userId }) {
-    let { organizationId, fullName, phone, openingBalance } = body;
-    this._createCustomer({ organizationId, fullName, phone, openingBalance, acceptedByUserId: userId }, (customerId) => {
+    let { organizationId, fullName, phone } = body;
+    this._createCustomer({ organizationId, fullName, phone }, (customerId) => {
       this.success({ status: "success", customerId });
     });
   }
diff --git a/server/src/legacy-apis/adjust-customer-balance.js b/server/src/legacy-apis/adjust-customer-balance.js
index 35aa7a693..1a3bf2b4d 100644
--- a/server/src/legacy-apis/adjust-customer-balance.js
+++ b/server/src/legacy-apis/adjust-customer-balance.js
@@ -6,6 +6,8 @@ let { customerCommonMixin } = require('./mixins/customer-common');
 
 exports.AdjustCustomerBalanceApi = class extends collectionCommonMixin(customerCommonMixin(LegacyApi)) {
 
+  get isEnabled() { return false; }
+
   get autoValidates() { return true; }
 
   get requiresAuthentication() { return true; }
diff --git a/server/src/legacy-collections/customer.js b/server/src/legacy-collections/customer.js
index ff972ec64..d45ac3df0 100644
--- a/server/src/legacy-collections/customer.js
+++ b/server/src/legacy-collections/customer.js
@@ -21,22 +21,24 @@ exports.CustomerCollection = class extends LegacyCollection {
     this.collectionName = 'customer';
 
     this.joiSchema = Joi.object().keys({
+
       createdDatetimeStamp: Joi.number().max(999999999999999).required(),
       lastModifiedDatetimeStamp: Joi.number().max(999999999999999).required(),
+      isDeleted: Joi.boolean().required(),
+
       fullName: Joi.string().min(1).max(64).required(),
       phone: Joi.string().regex(/^[a-z0-9\+]*$/i).min(11).max(15).required(),
       organizationId: Joi.number().max(999999999999999).required(),
-      balance: Joi.number().max(999999999999999).required(),
-      isDeleted: Joi.boolean().required(),
+      changeWalletBalance: Joi.number().max(999999999999999).required(),
 
-      additionalPaymentHistory: Joi.array().items(
+      withdrawalHistory: Joi.array().items(
         Joi.object().keys({
           creditedDatetimeStamp: Joi.number().max(999999999999999).required(),
-          acceptedByUserId: Joi.number().max(999999999999999).allow(null).required(),
-          amount: Joi.number().max(999999999999999).required(),
-          action: Joi.string().valid('payment', 'withdrawl').required()
+          byUserId: Joi.number().max(999999999999999).required(),
+          amount: Joi.number().max(999999999999999).required()
         })
       )
+
     });
 
     this.uniqueKeyDefList = [
@@ -55,20 +57,15 @@ exports.CustomerCollection = class extends LegacyCollection {
     ];
   }
 
-  create({ organizationId, fullName, phone, openingBalance, acceptedByUserId }, cbfn) {
+  create({ organizationId, fullName, phone }, cbfn) {
     let customer = {
       createdDatetimeStamp: (new Date).getTime(),
       lastModifiedDatetimeStamp: (new Date).getTime(),
       fullName,
       organizationId,
       phone,
-      balance: openingBalance,
-      additionalPaymentHistory: [{
-        creditedDatetimeStamp: (new Date).getTime(),
-        acceptedByUserId,
-        amount: openingBalance,
-        action: 'payment'
-      }],
+      changeWalletBalance: 0,
+      withdrawalHistory: [],
       isDeleted: false
     }
     this._insert(customer, (err, id) => {
diff --git a/server/test/lib.js b/server/test/lib.js
index a8d146543..9e05e96e6 100644
--- a/server/test/lib.js
+++ b/server/test/lib.js
@@ -771,21 +771,21 @@ exports.validateCustomerSchema = (doc) => {
     id: Joi.number().max(999999999999999).required(),
     createdDatetimeStamp: Joi.number().max(999999999999999).required(),
     lastModifiedDatetimeStamp: Joi.number().max(999999999999999).required(),
+    isDeleted: Joi.boolean().required(),
 
     fullName: Joi.string().min(1).max(64).required(),
     phone: Joi.string().regex(/^[a-z0-9\+]*$/i).min(11).max(15).required(),
     organizationId: Joi.number().max(999999999999999).required(),
-    balance: Joi.number().max(999999999999999).required(),
-    isDeleted: Joi.boolean().required(),
+    changeWalletBalance: Joi.number().max(999999999999999).required(),
 
-    additionalPaymentHistory: Joi.array().items(
+    withdrawalHistory: Joi.array().items(
       Joi.object().keys({
         creditedDatetimeStamp: Joi.number().max(999999999999999).required(),
-        acceptedByUserId: Joi.number().max(999999999999999).allow(null).required(),
-        amount: Joi.number().max(999999999999999).required(),
-        action: Joi.string().valid('payment', 'withdrawl').required()
+        byUserId: Joi.number().max(999999999999999).required(),
+        amount: Joi.number().max(999999999999999).required()
       })
     )
+
   });
   let { error, value } = Joi.validate(doc, schema);
   if (error) throw error;
diff --git a/server/test/test-customer-apis.js b/server/test/test-customer-apis.js
index 4498d702f..bad1391df 100644
--- a/server/test/test-customer-apis.js
+++ b/server/test/test-customer-apis.js
@@ -41,7 +41,7 @@ let secondOrganizationId = null;
 let invalidOrganizationId = generateInvalidId();
 let invalidCustomerId = generateInvalidId();
 
-describe('Customer', _ => {
+describe.only('Customer', _ => {
 
   it('START', testDoneFn => {
     initializeServer(_ => {
@@ -83,8 +83,7 @@ describe('Customer', _ => {
         apiKey,
         organizationId: invalidOrganizationId,
         fullName: "A Test Customer",
-        phone: customerPhone,
-        openingBalance: '500',
+        phone: customerPhone
       }
     }, (err, response, body) => {
       expect(response.statusCode).to.equal(200);
@@ -102,8 +101,7 @@ describe('Customer', _ => {
         apiKey,
         organizationId: organizationId,
         fullName: "1st Test Customer",
-        phone: customerPhone,
-        openingBalance: '500',
+        phone: customerPhone
       }
     }, (err, response, body) => {
       expect(response.statusCode).to.equal(200);
@@ -120,8 +118,7 @@ describe('Customer', _ => {
         apiKey,
         organizationId: organizationId,
         fullName: "2nd Test Customer",
-        phone: customerPhone2,
-        openingBalance: '500',
+        phone: customerPhone2
       }
     }, (err, response, body) => {
       expect(response.statusCode).to.equal(200);
@@ -138,8 +135,7 @@ describe('Customer', _ => {
         apiKey,
         organizationId: secondOrganizationId,
         fullName: "2nd Test Customer",
-        phone: customerPhone2,
-        openingBalance: '0',
+        phone: customerPhone2
       }
     }, (err, response, body) => {
       expect(response.statusCode).to.equal(200);
@@ -156,8 +152,7 @@ describe('Customer', _ => {
         apiKey,
         organizationId: organizationId,
         fullName: "A Test Customer",
-        phone: customerPhone,
-        openingBalance: '500',
+        phone: customerPhone
       }
     }, (err, response, body) => {
       expect(response.statusCode).to.equal(200);
@@ -175,8 +170,7 @@ describe('Customer', _ => {
         apiKey,
         organizationId: organizationId,
         fullName: "",
-        phone: customerPhone,
-        openingBalance: '500',
+        phone: customerPhone
       }
     }, (err, response, body) => {
       expect(response.statusCode).to.equal(200);
@@ -194,8 +188,7 @@ describe('Customer', _ => {
         apiKey,
         organizationId: "abc",
         fullName: "A Test Customer",
-        phone: customerPhone,
-        openingBalance: '500',
+        phone: customerPhone
       }
     }, (err, response, body) => {
       expect(response.statusCode).to.equal(200);
@@ -213,27 +206,7 @@ describe('Customer', _ => {
         apiKey,
         organizationId: organizationId,
         fullName: "A Test Customer",
-        phone: "this is invalid",
-        openingBalance: '500',
-      }
-    }, (err, response, body) => {
-      expect(response.statusCode).to.equal(200);
-      validateGenericApiFailureResponse(body);
-      expect(body.error.code).equals('VALIDATION_ERROR');
-      testDoneFn();
-    })
-
-  });
-
-  it('api/add-customer (Invalid openingBalance): ', testDoneFn => {
-
-    callApi('api/add-customer', {
-      json: {
-        apiKey,
-        organizationId: organizationId,
-        fullName: "A Test Customer",
-        phone: customerPhone,
-        openingBalance: 'abc',
+        phone: "this is invalid"
       }
     }, (err, response, body) => {
       expect(response.statusCode).to.equal(200);
@@ -379,7 +352,7 @@ describe('Customer', _ => {
 
   });
 
-  it('api/adjust-customer-balance (Valid Payment): ', testDoneFn => {
+  it.skip('api/adjust-customer-balance (Valid Payment): ', testDoneFn => {
 
     callApi('api/adjust-customer-balance', {
       json: {
@@ -396,7 +369,7 @@ describe('Customer', _ => {
 
   });
 
-  it('api/adjust-customer-balance (Valid Withdrawl): ', testDoneFn => {
+  it.skip('api/adjust-customer-balance (Valid Withdrawl): ', testDoneFn => {
 
     callApi('api/adjust-customer-balance', {
       json: {
@@ -413,7 +386,7 @@ describe('Customer', _ => {
 
   });
 
-  it('api/get-customer (Adjusted Balance check): ', testDoneFn => {
+  it.skip('api/get-customer (Adjusted Balance check): ', testDoneFn => {
 
     callApi('api/get-customer', {
       json: {
@@ -433,7 +406,7 @@ describe('Customer', _ => {
 
   });
 
-  it('api/adjust-customer-balance (Invalid customerId): ', testDoneFn => {
+  it.skip('api/adjust-customer-balance (Invalid customerId): ', testDoneFn => {
 
     callApi('api/adjust-customer-balance', {
       json: {
@@ -451,7 +424,7 @@ describe('Customer', _ => {
 
   });
 
-  it('api/adjust-customer-balance (Invalid Action): ', testDoneFn => {
+  it.skip('api/adjust-customer-balance (Invalid Action): ', testDoneFn => {
 
     callApi('api/adjust-customer-balance', {
       json: {
@@ -508,8 +481,7 @@ describe('Customer', _ => {
         apiKey,
         organizationId,
         fullName: 'Sample Customer' + index,
-        phone: (basePhone + index),
-        openingBalance: (50 + index)
+        phone: (basePhone + index)
       }, (data) => {
         return accept();
       });

From 643fb371722fbe46b6598ba46afa01e048195ab8 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Thu, 4 Oct 2018 19:20:14 +0600
Subject: [PATCH 14/74] all tests passing

---
 server/src/apis/add-sales.js          | 31 +++------------------------
 server/test/test-api-security.js      |  3 +--
 server/test/test-customer-apis.js     |  2 +-
 server/test/test-sales-apis.js        |  3 +--
 server/test/test-sales-return-apis.js |  3 +--
 5 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/server/src/apis/add-sales.js b/server/src/apis/add-sales.js
index 09112e73b..7bc133db4 100644
--- a/server/src/apis/add-sales.js
+++ b/server/src/apis/add-sales.js
@@ -72,30 +72,6 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin) {
     }
   }
 
-  async depr_handleReceivedPayment({ payment, customer }) {
-    if (payment.totalBilled > payment.paidAmount) {
-      if (customer) {
-        await this._adjustCustomerBalanceAndSave({ customer, action: 'withdrawl', amount: (payment.totalBilled - payment.paidAmount) });
-        return;
-      } else {
-        throw new CodedError("CREDIT_SALE_NOT_ALLOWED_WITHOUT_CUSTOMER", "credit sale is not allowed without registered cutomer");
-      }
-    }
-
-    if (payment.totalBilled == payment.paidAmount) {
-      return;
-    }
-
-    if (payment.totalBilled < payment.paidAmount) {
-      if (customer && payment.shouldSaveChangeInAccount) {
-        await this._adjustCustomerBalanceAndSave({ customer, action: 'payment', amount: (payment.totalBilled - payment.paidAmount) });
-        return;
-      } else {
-        return;
-      }
-    }
-  }
-
   async _handleReceivedPayment({ userId, payment, customer }) {
     let paymentList = [
       {
@@ -111,9 +87,7 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin) {
 
     if (payment.totalBilled > payment.paidAmount) {
       // console.log("payment.totalBilled > payment.paidAmount");
-      if (customer) {
-        await this._adjustCustomerBalanceAndSave({ customer, action: 'withdrawl', amount: (payment.totalBilled - payment.paidAmount) });
-      } else {
+      if (!customer) {
         throw new CodedError("CREDIT_SALE_NOT_ALLOWED_WITHOUT_CUSTOMER", "credit sale is not allowed without registered cutomer");
       }
     }
@@ -127,7 +101,8 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin) {
       if (customer && payment.shouldSaveChangeInAccount) {
         paymentList[0].wasChangeSavedInChangeWallet = true;
 
-        await this._adjustCustomerBalanceAndSave({ customer, action: 'payment', amount: (payment.totalBilled - payment.paidAmount) });
+        // add to customer changeWalletBalance
+        // await this._adjustCustomerBalanceAndSave({ customer, action: 'payment', amount: (payment.totalBilled - payment.paidAmount) });
       }
     }
 
diff --git a/server/test/test-api-security.js b/server/test/test-api-security.js
index 803e60807..ba1496c16 100644
--- a/server/test/test-api-security.js
+++ b/server/test/test-api-security.js
@@ -63,8 +63,7 @@ describe('Security', _ => {
         apiKey,
         organizationId: organizationId,
         fullName: "<script>alert('TEST AAA');</script>",
-        phone: customerPhone,
-        openingBalance: 500,
+        phone: customerPhone
       }
     }, (err, response, body) => {
       expect(response.statusCode).to.equal(200);
diff --git a/server/test/test-customer-apis.js b/server/test/test-customer-apis.js
index bad1391df..565ef2376 100644
--- a/server/test/test-customer-apis.js
+++ b/server/test/test-customer-apis.js
@@ -41,7 +41,7 @@ let secondOrganizationId = null;
 let invalidOrganizationId = generateInvalidId();
 let invalidCustomerId = generateInvalidId();
 
-describe.only('Customer', _ => {
+describe('Customer', _ => {
 
   it('START', testDoneFn => {
     initializeServer(_ => {
diff --git a/server/test/test-sales-apis.js b/server/test/test-sales-apis.js
index 95887a586..485984342 100644
--- a/server/test/test-sales-apis.js
+++ b/server/test/test-sales-apis.js
@@ -140,8 +140,7 @@ describe('Sales', _ => {
                       apiKey,
                       organizationId,
                       fullName: customerFullName,
-                      phone: customerPhone,
-                      openingBalance
+                      phone: customerPhone
                     }, (data) => {
                       customerId = data.customerId;
                       getCustomer({
diff --git a/server/test/test-sales-return-apis.js b/server/test/test-sales-return-apis.js
index f4e0fd64a..6d6816175 100644
--- a/server/test/test-sales-return-apis.js
+++ b/server/test/test-sales-return-apis.js
@@ -165,8 +165,7 @@ describe('Sales Return', _ => {
                           apiKey,
                           organizationId,
                           fullName: customerFullName,
-                          phone: customerPhone,
-                          openingBalance
+                          phone: customerPhone
                         }, (data) => {
                           customerId = data.customerId;
                           getCustomer({

From 8ad2727427502cf00ba15bc807f9d3221f477eef Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Thu, 4 Oct 2018 19:35:09 +0600
Subject: [PATCH 15/74] _setCustomerChangeWalletBalance added to CustomerMixin

---
 server/src/apis/add-sales.js             | 18 +++---------------
 server/src/apis/mixins/customer-mixin.js | 11 ++++++++++-
 server/src/collections/customer.js       | 10 ++++------
 server/test/test-sales-apis.js           |  4 ++--
 4 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/server/src/apis/add-sales.js b/server/src/apis/add-sales.js
index 7bc133db4..c1707b0ab 100644
--- a/server/src/apis/add-sales.js
+++ b/server/src/apis/add-sales.js
@@ -3,8 +3,9 @@ const Joi = require('joi');
 const { throwOnFalsy, throwOnTruthy, CodedError } = require('./../utils/coded-error');
 const { extract } = require('./../utils/extract');
 const { InventoryMixin } = require('./mixins/inventory-mixin');
+const { CustomerMixin } = require('./mixins/customer-mixin');
 
-exports.AddSalesApi = class extends Api.mixin(InventoryMixin) {
+exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
 
   get autoValidates() { return true; }
 
@@ -100,9 +101,7 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin) {
       // console.log("payment.totalBilled < payment.paidAmount");
       if (customer && payment.shouldSaveChangeInAccount) {
         paymentList[0].wasChangeSavedInChangeWallet = true;
-
-        // add to customer changeWalletBalance
-        // await this._adjustCustomerBalanceAndSave({ customer, action: 'payment', amount: (payment.totalBilled - payment.paidAmount) });
+        await this._setCustomerChangeWalletBalance({ customer, amount: (payment.totalBilled - payment.paidAmount) });
       }
     }
 
@@ -110,17 +109,6 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin) {
     return { totalAmount, vatAmount, discountType, discountValue, discountedAmount, serviceChargeAmount, totalBilled, totalPaidAmount: paymentList[0].paidAmount, paymentList};
   }
 
-  async _adjustCustomerBalanceAndSave({ customer, action, amount }) {
-    if (action === 'payment') {
-      customer.balance += amount;
-    } else if (action === 'withdrawl') {
-      customer.balance -= amount;
-    }
-
-    await this.database.customer.setBalance({ id: customer.id }, { balance: customer.balance });
-    return;
-  }
-
   async handle({ userId, body }) {
     let { outletId, customerId, productList, payment } = body;
     
diff --git a/server/src/apis/mixins/customer-mixin.js b/server/src/apis/mixins/customer-mixin.js
index d05bbb50a..ea2724eb2 100644
--- a/server/src/apis/mixins/customer-mixin.js
+++ b/server/src/apis/mixins/customer-mixin.js
@@ -1,3 +1,12 @@
 const { throwOnFalsy, throwOnTruthy, CodedError } = require('../../utils/coded-error');
 
-exports.CustomerMixin = (SuperApiClass) => class extends SuperApiClass {}
\ No newline at end of file
+exports.CustomerMixin = (SuperApiClass) => class extends SuperApiClass {
+
+  async _setCustomerChangeWalletBalance({ customer, amount }) {
+    let changeWalletBalance = customer.changeWalletBalance + amount;
+    let doc = await this.database.customer.setChangeWalletBalance({ id: customer.id }, { changeWalletBalance });
+    throwOnFalsy(doc, "UNABLE_TO_UPDATE_CUSTOMER_CHANGE_WALLET_BALANCE", "Unable to update customer change wallet balance");
+    return;
+  }
+  
+}
\ No newline at end of file
diff --git a/server/src/collections/customer.js b/server/src/collections/customer.js
index e22a37a72..0bb6c2676 100644
--- a/server/src/collections/customer.js
+++ b/server/src/collections/customer.js
@@ -71,20 +71,18 @@ exports.CustomerCollection = class extends Collection {
     });
   }
 
-  // TODO: this should set withdrawalHistory
-  async setAdditionalPaymentHistory({ id }, { additionalPaymentHistory }) {
+  async setWithdrawalHistory({ id }, { withdrawalHistory }) {
     return await this._update({ id }, {
       $set: {
-        additionalPaymentHistory
+        withdrawalHistory
       }
     });
   }
 
-  // TODO: this should set changeWalletBalance
-  async setBalance({ id }, { balance }) {
+  async setChangeWalletBalance({ id }, { changeWalletBalance }) {
     return await this._update({ id }, {
       $set: {
-        balance
+        changeWalletBalance
       }
     });
   }
diff --git a/server/test/test-sales-apis.js b/server/test/test-sales-apis.js
index 485984342..01d761f2f 100644
--- a/server/test/test-sales-apis.js
+++ b/server/test/test-sales-apis.js
@@ -82,7 +82,7 @@ let fromDate = new Date();
 fromDate.setDate(fromDate.getDate() - 1);
 fromDate = fromDate.getTime();
 
-describe('Sales', _ => {
+describe.only('Sales', _ => {
 
   it('START', testDoneFn => {
     initializeServer(_ => {
@@ -454,7 +454,7 @@ describe('Sales', _ => {
           totalBilled: (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100))),
           paidAmount: 300,
           changeAmount: (300 - (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100)))),
-          shouldSaveChangeInAccount: false,
+          shouldSaveChangeInAccount: true,
           paymentMethod: 'cash'
         }
       }

From 920a70b68f0716878a15abcd3c01c7aec8ad5d05 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Thu, 4 Oct 2018 20:10:12 +0600
Subject: [PATCH 16/74] _setCustomerChangeWalletBalance better

---
 server/src/apis/add-sales.js             | 2 +-
 server/src/apis/mixins/customer-mixin.js | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/server/src/apis/add-sales.js b/server/src/apis/add-sales.js
index c1707b0ab..b5a01a39d 100644
--- a/server/src/apis/add-sales.js
+++ b/server/src/apis/add-sales.js
@@ -101,7 +101,7 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
       // console.log("payment.totalBilled < payment.paidAmount");
       if (customer && payment.shouldSaveChangeInAccount) {
         paymentList[0].wasChangeSavedInChangeWallet = true;
-        await this._setCustomerChangeWalletBalance({ customer, amount: (payment.totalBilled - payment.paidAmount) });
+        await this._setCustomerChangeWalletBalance({ customer, changeWalletBalance: (customer.changeWalletBalance + payment.totalBilled - payment.paidAmount) });
       }
     }
 
diff --git a/server/src/apis/mixins/customer-mixin.js b/server/src/apis/mixins/customer-mixin.js
index ea2724eb2..0645a0e60 100644
--- a/server/src/apis/mixins/customer-mixin.js
+++ b/server/src/apis/mixins/customer-mixin.js
@@ -2,8 +2,7 @@ const { throwOnFalsy, throwOnTruthy, CodedError } = require('../../utils/coded-e
 
 exports.CustomerMixin = (SuperApiClass) => class extends SuperApiClass {
 
-  async _setCustomerChangeWalletBalance({ customer, amount }) {
-    let changeWalletBalance = customer.changeWalletBalance + amount;
+  async _setCustomerChangeWalletBalance({ customer, changeWalletBalance }) {
     let doc = await this.database.customer.setChangeWalletBalance({ id: customer.id }, { changeWalletBalance });
     throwOnFalsy(doc, "UNABLE_TO_UPDATE_CUSTOMER_CHANGE_WALLET_BALANCE", "Unable to update customer change wallet balance");
     return;

From 516d33b064106f28a289dac5634d7bdc0fd4c470 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Thu, 4 Oct 2018 20:18:06 +0600
Subject: [PATCH 17/74] handle better, has empty _manualPaymentValidation

---
 meta/api-docs/add-sales.md   | 1 +
 server/src/apis/add-sales.js | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/meta/api-docs/add-sales.md b/meta/api-docs/add-sales.md
index f301cbc45..d473369dc 100644
--- a/meta/api-docs/add-sales.md
+++ b/meta/api-docs/add-sales.md
@@ -58,6 +58,7 @@ Possible Error Codes:
 { code: CREDIT_SALE_NOT_ALLOWED_WITHOUT_CUSTOMER }
 { code: PRODUCT_INVALID } // product could not be found
 { code: INSUFFICIENT_PRODUCT } // not enough product in inventory
+{ code: BILL_INACCURATE } // Bill is mathematically inaccurate
 ```
 
 ### response (on success):
diff --git a/server/src/apis/add-sales.js b/server/src/apis/add-sales.js
index b5a01a39d..17c77133d 100644
--- a/server/src/apis/add-sales.js
+++ b/server/src/apis/add-sales.js
@@ -60,6 +60,11 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
     }];
   }
 
+  _manualPaymentValidation({ payment }) {
+    // TODO: should check if adding product(s) salePrice and modifiers (discountedAmount, serviceChargeAmount) equals totalBilled
+    // throw new CodedError("BILL_INACCURATE", "Bill is mathematically inaccurate");
+  }
+
   _reduceProductCountFromOutletDefaultInventory({ outletDefaultInventory, productList }) {
     for (let product of productList) {
       let foundProduct = outletDefaultInventory.productList.find(_product => _product.productId === product.productId);
@@ -101,7 +106,7 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
       // console.log("payment.totalBilled < payment.paidAmount");
       if (customer && payment.shouldSaveChangeInAccount) {
         paymentList[0].wasChangeSavedInChangeWallet = true;
-        await this._setCustomerChangeWalletBalance({ customer, changeWalletBalance: (customer.changeWalletBalance + payment.totalBilled - payment.paidAmount) });
+        await this._setCustomerChangeWalletBalance({ customer, changeWalletBalance: (customer.changeWalletBalance + payment.paidAmount - payment.totalBilled) });
       }
     }
 
@@ -111,6 +116,7 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
 
   async handle({ userId, body }) {
     let { outletId, customerId, productList, payment } = body;
+    this._manualPaymentValidation({ payment });
     
     let customer = null;
     if (customerId) {

From d0138eb15690b9c11953573f04fbee392b6ec06d Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Fri, 5 Oct 2018 11:24:08 +0600
Subject: [PATCH 18/74] sales list feature working

---
 client/src/lang-bn-bd.json        |  1 +
 client/src/lang-en-us.json        |  1 +
 client/src/page-manage-sales.html | 14 ++++++++++++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/client/src/lang-bn-bd.json b/client/src/lang-bn-bd.json
index 20af0682c..61696a0b8 100644
--- a/client/src/lang-bn-bd.json
+++ b/client/src/lang-bn-bd.json
@@ -438,6 +438,7 @@
     "manageSalesTitle": "বিক্রয় রেকর্ড",
     "salesId": "বিক্রয় আইডি",
     "billed": "বিল",
+    "paid": "প্রদত্ত",
     "products": "পণ্য",
     "noCustomerSelected": "কোন গ্রাহক নির্বাচন করা হয়নি",
     "removeCustomer": "গ্রাহক সরান",
diff --git a/client/src/lang-en-us.json b/client/src/lang-en-us.json
index 0f63eb8da..bb6c45b2a 100644
--- a/client/src/lang-en-us.json
+++ b/client/src/lang-en-us.json
@@ -436,6 +436,7 @@
     "manageSalesTitle": "Sales Record",
     "salesId": "Sales Id",
     "billed": "Billed",
+    "paid": "Paid",
     "products": "product(s)",
     "noCustomerSelected": "No customer selected (Anonymous Sale Return)",
     "removeCustomer": "Remove Customer",
diff --git a/client/src/page-manage-sales.html b/client/src/page-manage-sales.html
index 300ac151f..acc37f231 100644
--- a/client/src/page-manage-sales.html
+++ b/client/src/page-manage-sales.html
@@ -27,6 +27,14 @@
   <template>
     <style include="shared-styles">
 
+      .description {
+        font-size: 15px;
+      }
+
+      .description-time {
+        font-size: 12px;
+      }
+
     </style>
 
     <elem-not-ready is-ready="[[isReady]]"></elem-not-ready>
@@ -107,8 +115,9 @@
               <div class="horizontal layout item center">
                 <div class="vertical layout flex">
                   <div class="title">[[verses.sales.salesId]]: [[sale.id]]</div>
-                  <div class="description">[[$mkDate(sale.createdDatetimeStamp, 'hh:mmtt dd-MM-yyyy')]]</div>
-                  <div class="description">[[verses.sales.billed]]: [[$round(sale.payment.totalBilled)]] [[app.settings.monetaryUnit]], [[sale.productList.length]] [[verses.sales.products]]</div>
+                  <div class="description-time">[[$mkDate(sale.createdDatetimeStamp, 'hh:mmtt dd-MM-yyyy')]]</div>
+                  <div class="description">[[verses.sales.billed]]: [[$round(sale.payment.totalBilled)]] [[app.settings.monetaryUnit]], [[verses.sales.paid]]: [[$round(sale.payment.totalPaidAmount)]] [[app.settings.monetaryUnit]]</div>
+                  <div class="description">[[sale.productList.length]] [[verses.sales.products]]</div>
                 </div>
                 <paper-button raised class="secondary" on-tap="viewTapped">[[verses.general.view]]</paper-button>
               </div>
@@ -283,6 +292,7 @@
       _processSalesList(cbfn) {
         this._fetchSalesList(newSalesList => {
           this.salesList = newSalesList;
+          console.log("sales list: ", this.salesList);
           cbfn();
         });
       }

From 1ef4d3523a81eede503589ad5cff15abb21cf764 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Fri, 5 Oct 2018 11:48:00 +0600
Subject: [PATCH 19/74] view sales works

---
 client/src/lang-bn-bd.json        |  2 ++
 client/src/lang-en-us.json        |  2 ++
 client/src/page-manage-sales.html |  1 -
 client/src/page-view-sales.html   | 38 +++++++++++++++++++++++--------
 4 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/client/src/lang-bn-bd.json b/client/src/lang-bn-bd.json
index 61696a0b8..927e066f1 100644
--- a/client/src/lang-bn-bd.json
+++ b/client/src/lang-bn-bd.json
@@ -458,6 +458,8 @@
     "serviceChargeAmount": "সেবা মূল্য",
     "vat": "ভ্যাট",
     "paidAmount": "পরিশোধিত",
+    "totalPaid": "মোট পরিশোধিত",
+    "paymentList": "মূল্যপরিশোধ তালিকা",
     "paymentMethod": "মূল্যপরিশোধ পদ্ধতি",
     "changeAmount": "ফেরত",
     "wasDebitedToUser": "গ্রাহককে ডেবিট করা হয়েছিল।",
diff --git a/client/src/lang-en-us.json b/client/src/lang-en-us.json
index bb6c45b2a..3a68d45cb 100644
--- a/client/src/lang-en-us.json
+++ b/client/src/lang-en-us.json
@@ -456,6 +456,8 @@
     "serviceChargeAmount": "Service Charge Amount",
     "vat": "VAT",
     "paidAmount": "Paid Amount",
+    "totalPaid": "Total Paid Amount",
+    "paymentList": "Payemnt list",
     "paymentMethod": "Payment Method",
     "changeAmount": "Change Amount",
     "wasDebitedToUser": "was debited to user.",
diff --git a/client/src/page-manage-sales.html b/client/src/page-manage-sales.html
index acc37f231..54076fe88 100644
--- a/client/src/page-manage-sales.html
+++ b/client/src/page-manage-sales.html
@@ -292,7 +292,6 @@
       _processSalesList(cbfn) {
         this._fetchSalesList(newSalesList => {
           this.salesList = newSalesList;
-          console.log("sales list: ", this.salesList);
           cbfn();
         });
       }
diff --git a/client/src/page-view-sales.html b/client/src/page-view-sales.html
index cc071f29c..d15455687 100644
--- a/client/src/page-view-sales.html
+++ b/client/src/page-view-sales.html
@@ -28,6 +28,17 @@
         width: 100%;
       }
 
+      .list-object {
+        border: 1px solid #eee;
+        background-color: #f7f7f7;
+        padding: 6px;
+        margin: 4px 0px;
+      }
+
+      .dated {
+        font-size: 12px;
+      }
+
     </style>
 
     <elem-not-ready is-ready="[[isReady]]"></elem-not-ready>
@@ -54,8 +65,9 @@
         </div>
         <div class="list">
           <template is="dom-repeat" items="{{sales.productList}}" as="product">
-            <div class="horizontal layout item center">
-              <div class="vertical layout flex">
+            <div class="vertical layout flex">
+              <div class="list-object">
+              
                 <div>[[verses.general.product]]: [[product.productCategoryName]]</div>
                 <div>[[verses.general.count]]: [[product.count]]</div>
                 <div>[[verses.sales.salePrice]]: [[product.salePrice]] [[app.settings.monetaryUnit]]</div>
@@ -65,6 +77,7 @@
                 <template is="dom-if" if="{{checkIfProductReturnable(product.returnedProductCount, product.count, product.productCategoryIsReturnable)}}">
                   <paper-button raised class="danger discard-button" on-tap="returnTapped">[[verses.general.return]]</paper-button>
                 </template>
+
               </div>
             </div>
           </template>
@@ -79,14 +92,20 @@
         <div>[[verses.sales.discounted]]: [[$round(sales.payment.discountedAmount)]] [[app.settings.monetaryUnit]] [[verses.general.by]] [[sales.payment.discountValue]] [[sales.payment.discountType]]</div>
         <div>[[verses.sales.serviceChargeAmount]]: [[$round(sales.payment.serviceChargeAmount)]] [[app.settings.monetaryUnit]]</div>
         <div>[[verses.sales.vat]]: [[$round(sales.payment.vatAmount)]] [[app.settings.monetaryUnit]]</div>
-        <div>[[verses.sales.paidAmount]]: [[$round(sales.payment.paidAmount)]] [[app.settings.monetaryUnit]]</div>
-        <template is="dom-if" if="[[sales.payment.paymentMethod]]">
-          <div>[[verses.sales.paymentMethod]]: [[sales.payment.paymentMethod]]</div>
-        </template>
-        <div>[[verses.sales.changeAmount]]: [[$round(sales.payment.changeAmount)]] [[app.settings.monetaryUnit]]</div>
-        <template is="dom-if" if="[[sales.payment.shouldSaveChangeInAccount]]">
-          <div>([[$round(sales.payment.changeAmount)]] [[app.settings.monetaryUnit]] [[verses.sales.wasDebitedToUser]])</div>
+        <div>[[verses.sales.totalPaid]]: [[$round(sales.payment.totalPaidAmount)]] [[app.settings.monetaryUnit]]</div>
+
+        <div>
+          <b>[[verses.sales.paymentList]]:</b>
+        </div>
+        <template is="dom-repeat" items="[[sales.payment.paymentList]]" as="payment">
+          <div class="list-object">
+            <div>[[verses.sales.paidAmount]]: [[$round(payment.paidAmount)]] [[app.settings.monetaryUnit]]</div>
+            <div>[[verses.sales.changeAmount]]: [[$round(payment.changeAmount)]] [[app.settings.monetaryUnit]]</div>
+            <div>[[verses.sales.paymentMethod]]: [[payment.paymentMethod]]</div>
+            <div class="dated">[[verses.general.dated]]: [[$mkDate(payment.createdDatetimeStamp, 'hh:mmtt dd-MM-yyyy')]]</div>
+          </div>
         </template>
+
       </div>
 
     </div>
@@ -151,7 +170,6 @@
       _processSales(cbfn) {
         this._fetchSales(({ sales }) => {
           this.sales = sales;
-          console.log(this.sales);
           cbfn();
         });
       }

From 2aa890b38396a2f4ec37ddb2e38ee3414a6f018a Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Fri, 5 Oct 2018 12:08:35 +0600
Subject: [PATCH 20/74] customer being shown in sales view

---
 client/src/lang-bn-bd.json      |  4 ++-
 client/src/lang-en-us.json      |  4 ++-
 client/src/page-view-sales.html | 48 ++++++++++++++++++++++++---------
 3 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/client/src/lang-bn-bd.json b/client/src/lang-bn-bd.json
index 927e066f1..2ef71e214 100644
--- a/client/src/lang-bn-bd.json
+++ b/client/src/lang-bn-bd.json
@@ -384,7 +384,9 @@
     "noCustomerFound": "কোনো গ্রাহক পাওয়া যায় নি।",
 
     "searchForCustomerInput": "গ্রাহকের নাম/নম্বর",
-    "searchForCustomerInputError": "গ্রাহকের সন্ধানে ত্রুটি"
+    "searchForCustomerInputError": "গ্রাহকের সন্ধানে ত্রুটি",
+
+    "customerName": "গ্রাহকের নাম"
   },
   "editProfile": {
     "editProfileTitle": "প্রোফাইল সম্পাদনা",
diff --git a/client/src/lang-en-us.json b/client/src/lang-en-us.json
index 3a68d45cb..dd209d41d 100644
--- a/client/src/lang-en-us.json
+++ b/client/src/lang-en-us.json
@@ -382,7 +382,9 @@
     "noCustomerFound": "No Customer Found.",
 
     "searchForCustomerInput": "Customer Name/Number",
-    "searchForCustomerInputError": "Error in Search"
+    "searchForCustomerInputError": "Error in Search",
+
+    "customerName": "Customer Name"
   },
   "editProfile": {
     "editProfileTitle": "Edit Profile",
diff --git a/client/src/page-view-sales.html b/client/src/page-view-sales.html
index d15455687..99d49871e 100644
--- a/client/src/page-view-sales.html
+++ b/client/src/page-view-sales.html
@@ -46,17 +46,17 @@
     <div class$="page layout vertical [[$if(isReady, '', 'hidden')]]" id="wrapper">
 
       <div class="card vertical layout">
-        <div class="list">
-          <div>[[verses.general.id]]: [[sales.id]]</div>
-          <div>[[verses.general.dated]]: [[$mkDate(sales.createdDatetimeStamp, 'hh:mmtt dd-MM-yyyy')]]</div>
-          <div>[[verses.sales.outletId]]: [[sales.outletId]]</div>
-          <template is="dom-if" if="{{sales.customerId}}">
-            <div>[[verses.sales.customerId]]: [[sales.customerId]]</div>
-          </template>
-          <template is="dom-if" if="{{!sales.isDiscarded}}">
-            <paper-button raised class="danger discard-button" on-tap="discardTapped">[[verses.general.discard]]</paper-button>
-          </template>
-        </div>
+        
+        <div>[[verses.general.id]]: [[sales.id]]</div>
+        <div>[[verses.general.dated]]: [[$mkDate(sales.createdDatetimeStamp, 'hh:mmtt dd-MM-yyyy')]]</div>
+        <div>[[verses.sales.outletId]]: [[sales.outletId]]</div>
+        <template is="dom-if" if="{{sales.customerId}}">
+          <div>[[verses.sales.customerId]]: [[sales.customerId]]</div>
+        </template>
+        <template is="dom-if" if="{{!sales.isDiscarded}}">
+          <paper-button raised class="danger discard-button" on-tap="discardTapped">[[verses.general.discard]]</paper-button>
+        </template>
+        
       </div>
 
       <div class="card vertical layout">
@@ -108,6 +108,14 @@
 
       </div>
 
+      <template is="dom-if" if="{{sales.customerId}}">
+        <div class="card vertical layout">
+          <div>[[verses.customer.customerName]] [[customer.fullName]]</div>
+          <div>[[verses.general.balance]]: [[$round(customer.changeWalletBalance)]] [[app.settings.monetaryUnit]]</div>
+          <div>[[verses.general.number]]: [[customer.phone]]</div>
+        </div>
+      </template>
+
     </div>
 
   </template>
@@ -167,10 +175,26 @@
         });
       }
 
+      _fetchCustomer({ customerId }, cbfn) {
+        let data = { customerId };
+        this.app.callGetCustomerApi(data, (err, response) => {
+          if (err) return;
+          if (response.hasError) return this.onApiError(response.error);
+          return cbfn(response.customer);
+        });
+      }
+
       _processSales(cbfn) {
         this._fetchSales(({ sales }) => {
           this.sales = sales;
-          cbfn();
+          if (this.sales.customerId) {
+            this._fetchCustomer({ customerId: this.sales.customerId }, (customer) => {
+              this.customer = customer;
+              cbfn();
+            })
+          } else {
+            cbfn();
+          }
         });
       }
 

From c394023551693203843d6223e7387a312cb7fd61 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Fri, 5 Oct 2018 12:19:37 +0600
Subject: [PATCH 21/74] wip

---
 server/src/apis/add-sales.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/apis/add-sales.js b/server/src/apis/add-sales.js
index 17c77133d..6b61d0334 100644
--- a/server/src/apis/add-sales.js
+++ b/server/src/apis/add-sales.js
@@ -60,7 +60,7 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
     }];
   }
 
-  _manualPaymentValidation({ payment }) {
+  _manualPaymentValidation({ productList, payment }) {
     // TODO: should check if adding product(s) salePrice and modifiers (discountedAmount, serviceChargeAmount) equals totalBilled
     // throw new CodedError("BILL_INACCURATE", "Bill is mathematically inaccurate");
   }
@@ -116,7 +116,7 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
 
   async handle({ userId, body }) {
     let { outletId, customerId, productList, payment } = body;
-    this._manualPaymentValidation({ payment });
+    this._manualPaymentValidation({ productList, payment });
     
     let customer = null;
     if (customerId) {

From b75594b27c2854719547644bb49b7af58d7e576d Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Fri, 5 Oct 2018 12:34:47 +0600
Subject: [PATCH 22/74] customer add edit done withdrawalHistory shown

---
 client/src/lang-bn-bd.json            |  2 +-
 client/src/lang-en-us.json            |  2 +-
 client/src/page-edit-customer.html    | 17 +++++--------
 client/src/page-manage-customers.html |  2 +-
 client/src/page-view-customer.html    | 36 +++++++++++++--------------
 5 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/client/src/lang-bn-bd.json b/client/src/lang-bn-bd.json
index 2ef71e214..1ef1934af 100644
--- a/client/src/lang-bn-bd.json
+++ b/client/src/lang-bn-bd.json
@@ -373,7 +373,7 @@
     "deleteCustomerQuestionPartOne": "আপনি কি এই গ্রাহককে মুছে ফেলতে চান?",
     "deleteCustomerQuestionPartTwo": "একবার মুছে ফেলা হলে, আপনি এই গ্রাহকটি পুনরুদ্ধার করতে পারবেন না।",
     "customerDeleted": "গ্রাহক মোছা হয়েছে",
-    "additionalPaymentHistory": "অর্থ আদান-প্রদান ইতিহাস",
+    "withdrawalHistory": "অর্থ অপসারণ ইতিহাস",
     "acceptedBy": "দ্বারা গৃহীত",
     "clickToEditCustomer": "গ্রাহক সম্পাদনা করতে এখানে ক্লিক করুন।",
     "editCustomer": "গ্রাহক সম্পাদনা",
diff --git a/client/src/lang-en-us.json b/client/src/lang-en-us.json
index dd209d41d..ba591e532 100644
--- a/client/src/lang-en-us.json
+++ b/client/src/lang-en-us.json
@@ -371,7 +371,7 @@
     "deleteCustomerQuestionPartOne": "Are you sure you want to delete this customer",
     "deleteCustomerQuestionPartTwo": "Once deleted, you can not restore this customer.",
     "customerDeleted": "Customer has been deleted",
-    "additionalPaymentHistory": "Additional Payment History",
+    "withdrawalHistory": "Withdrawal History",
     "acceptedBy": "Accepted By",
     "clickToEditCustomer": "Click here to edit the customer.",
     "editCustomer": "Edit Customer",
diff --git a/client/src/page-edit-customer.html b/client/src/page-edit-customer.html
index 19bb24246..14601aa4e 100644
--- a/client/src/page-edit-customer.html
+++ b/client/src/page-edit-customer.html
@@ -33,9 +33,6 @@
           <div class="card vertical layout">
             <paper-input class="editCustomerForm--fullName" value="{{editCustomerForm.fullName}}" required minlength="3" error-message=[[verses.customer.customerNameInputError]] label=[[verses.customer.customerNameInput]]></paper-input>
             <paper-input class="editCustomerForm--phone" value="{{editCustomerForm.phone}}" required minlength="11" maxlength="15" error-message=[[verses.customer.customerNumberInputError]] label=[[verses.customer.customerNumberInput]]></paper-input>
-            <template is="dom-if" if="{{!editMode}}">
-              <paper-input class$="editCustomerForm--openingBalance" value="{{editCustomerForm.openingBalance}}" type="number" required minlength="0" maxlength="8" error-message=[[verses.customer.openingBalanceError]] label=[[verses.customer.openingBalance]]></paper-input>
-            </template>
             <div class="horizontal layout button-row end">
               <div class="flex"></div>
               <paper-button raised class$="primary [[$if(editMode, 'hidden', '')]] editCustomerForm--submit" on-tap="createCustomerTapped">[[verses.customer.createCustomer]]</paper-button>
@@ -70,14 +67,12 @@
               if (mode === 'development') {
                 return {
                   fullName: 'Rahim Karim',
-                  phone: '01700000011',
-                  openingBalance: '100',
+                  phone: '01700000011'
                 };
               } else {
                 return {
                   fullName: '',
-                  phone: '',
-                  openingBalance: ''
+                  phone: ''
                 };
               }
             }
@@ -143,9 +138,9 @@
         });
       }
 
-      _processCreateCustomer({ fullName, phone, openingBalance }) {
+      _processCreateCustomer({ fullName, phone }) {
         let data = {
-          fullName, phone, openingBalance,
+          fullName, phone,
           organizationId: this.app.organization.id
         };
         this.app.callAddCustomerApi(data, (err, response) => {
@@ -184,8 +179,8 @@
         this.elemAll('#editCustomerForm paper-input').forEach(el => el.autoValidate = true);
         if (!this.elem('#editCustomerForm').validate()) return;
 
-        let { fullName, phone, openingBalance } = this.editCustomerForm;
-        this._processCreateCustomer({ fullName, phone, openingBalance });
+        let { fullName, phone } = this.editCustomerForm;
+        this._processCreateCustomer({ fullName, phone });
       }
 
       updateCustomerTapped(e = null) {
diff --git a/client/src/page-manage-customers.html b/client/src/page-manage-customers.html
index e262ec19e..55c584f15 100644
--- a/client/src/page-manage-customers.html
+++ b/client/src/page-manage-customers.html
@@ -61,7 +61,7 @@
                 <div class="content">
                   <div class="person-name-container">[[verses.general.name]]: [[customer.fullName]]</div>
                   <div class="person-phone-container">[[verses.general.phone]]: [[customer.phone]]</div>
-                  <div class="person-detail-container">[[verses.general.balance]]: [[$round(customer.balance)]] [[app.settings.monetaryUnit]]</div>
+                  <div class="person-detail-container">[[verses.general.balance]]: [[$round(customer.changeWalletBalance)]] [[app.settings.monetaryUnit]]</div>
                 </div>
                 <div class="control-buttons">
                   <paper-button raised class="secondary" on-tap="viewTapped">
diff --git a/client/src/page-view-customer.html b/client/src/page-view-customer.html
index 8d9ad2f99..8dbe1adda 100644
--- a/client/src/page-view-customer.html
+++ b/client/src/page-view-customer.html
@@ -37,35 +37,35 @@
 
       <div class="card vertical layout">
         <div>[[customer.fullName]]</div>
-        <div>[[verses.general.balance]]: [[$round(customer.balance)]] [[app.settings.monetaryUnit]]</div>
-        <!-- <div>[[verses.general.balance]]: [[$round(customer.balance)]]</div> -->
+        <div>[[verses.general.balance]]: [[$round(customer.changeWalletBalance)]] [[app.settings.monetaryUnit]]</div>
         <div>[[verses.general.number]]: [[customer.phone]]</div>
       </div>
 
-      <div class="card vertical layout">
-        [[verses.customer.additionalPaymentHistory]]:
-        <template is="dom-repeat" items="[[customer.additionalPaymentHistory]]" as="additionalPayment">
-          <div>
-            <b>#[[index]]</b> [[verses.general.date]]: [[$mkDate(additionalPayment.creditedDatetimeStamp, 'hh:mmtt dd-MM-yyyy')]]
-          </div>
-          <div>
-            [[verses.general.amount]]: [[$round(additionalPayment.amount)]] [[app.settings.monetaryUnit]]
-          </div>
-          <div>
-            [[verses.general.action]]: [[additionalPayment.action]]
-          </div>
-        </template>
-      </div>
+      <template is="dom-if" if="[[customer.withdrawalHistory.length]]">
+        <div class="card vertical layout">
+
+          [[verses.customer.withdrawalHistory]]:
+          <template is="dom-repeat" items="[[customer.withdrawalHistory]]" as="withdrawal">
+            <div>
+              <b>#[[index]]</b> [[verses.general.date]]: [[$mkDate(withdrawal.creditedDatetimeStamp, 'hh:mmtt dd-MM-yyyy')]]
+            </div>
+            <div>
+              [[verses.general.amount]]: [[$round(withdrawal.amount)]] [[app.settings.monetaryUnit]]
+            </div>
+          </template>
+
+        </div>
+      </template>
 
       <div class="card action-button-container">
         <div class="mb-4">[[verses.customer.clickToEditCustomer]]</div>
         <paper-button raised class="secondary m-0" on-tap="editTapped">[[verses.customer.editCustomer]]</paper-button>
       </div>
 
-      <div class="card action-button-container">
+      <!-- <div class="card action-button-container">
         <div class="mb-4">[[verses.customer.clickAdjustCustomersBalance]]</div>
         <paper-button raised class="secondary m-0" on-tap="adjustCustomerBalanceTapped">[[verses.customer.adjustCustomerBalance]]</paper-button>
-      </div>
+      </div> -->
 
       <!-- <div class="card action-button-container">
         <div class="mb-4">[[verses.customer.clickToDeleteCustomer]]</div>

From 96677a576215134509b23398c0c034e20bc4e01e Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Fri, 5 Oct 2018 13:27:10 +0600
Subject: [PATCH 23/74] elem customer selector has changeWalletBalance

---
 client/src/elem-customer-selector.html   | 2 +-
 client/src/page-manage-sales-return.html | 2 +-
 client/src/page-manage-sales.html        | 2 +-
 client/src/page-pos.html                 | 2 +-
 client/src/page-report-sales.html        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/src/elem-customer-selector.html b/client/src/elem-customer-selector.html
index 946ede31e..83adeefee 100644
--- a/client/src/elem-customer-selector.html
+++ b/client/src/elem-customer-selector.html
@@ -101,7 +101,7 @@
                 </div>
                 <div class="horizontal layout center">
                   <iron-icon icon="editor:attach-money" class="icon small"></iron-icon>
-                  <div class="type caption-2">[[customer.balance]] [[page.app.settings.monetaryUnit]]</div>
+                  <div class="type caption-2">[[customer.changeWalletBalance]] [[page.app.settings.monetaryUnit]]</div>
                 </div>
               </div>
             </div>
diff --git a/client/src/page-manage-sales-return.html b/client/src/page-manage-sales-return.html
index d1da37e51..5929f964a 100644
--- a/client/src/page-manage-sales-return.html
+++ b/client/src/page-manage-sales-return.html
@@ -47,7 +47,7 @@
                 [[verses.general.customer]]:
                 <b>[[customer.fullName]]</b> ([[customer.phone]])
                 <br>[[verses.general.balance]]:
-                <b>[[$round(customer.balance)]] [[app.settings.monetaryUnit]]</b>
+                <b>[[$round(customer.changeWalletBalance)]] [[app.settings.monetaryUnit]]</b>
               </template>
             </div>
             <template is="dom-if" if="[[customer]]">
diff --git a/client/src/page-manage-sales.html b/client/src/page-manage-sales.html
index 54076fe88..81fd868f0 100644
--- a/client/src/page-manage-sales.html
+++ b/client/src/page-manage-sales.html
@@ -57,7 +57,7 @@
                 [[verses.general.customer]]:
                 <b>[[customer.fullName]]</b> ([[customer.phone]])
                 <br>[[verses.general.balance]]:
-                <b>[[$round(customer.balance)]] [[app.settings.monetaryUnit]]</b>
+                <b>[[$round(customer.changeWalletBalance)]] [[app.settings.monetaryUnit]]</b>
               </template>
             </div>
             <div class="horizontal layout center">
diff --git a/client/src/page-pos.html b/client/src/page-pos.html
index 16f765072..612da6c1a 100644
--- a/client/src/page-pos.html
+++ b/client/src/page-pos.html
@@ -82,7 +82,7 @@
                     </div>
                     <div class="horizontal layout center">
                       <iron-icon icon="icons:account-balance-wallet" class="icon secondary small m-right-8"></iron-icon>
-                      <div class="type body secondary">[[customer.balance]] [[page.app.settings.monetaryUnit]]</div>
+                      <div class="type body secondary">[[customer.changeWalletBalance]] [[page.app.settings.monetaryUnit]]</div>
                     </div>
                   </div>
                 </div>
diff --git a/client/src/page-report-sales.html b/client/src/page-report-sales.html
index 042bc0366..d04910f65 100644
--- a/client/src/page-report-sales.html
+++ b/client/src/page-report-sales.html
@@ -106,7 +106,7 @@
                   [[verses.general.customer]]:
                   <b>[[customer.fullName]]</b> ([[customer.phone]])
                   <br> [[verses.general.balance]]:
-                  <b>[[$round(customer.balance)]] [[app.settings.monetaryUnit]]</b>
+                  <b>[[$round(customer.changeWalletBalance)]] [[app.settings.monetaryUnit]]</b>
                 </template>
               </div>
               <div class="horizontal layout center">

From 834c0957ab6063a17c85e2ae33063b7bce199673 Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Fri, 5 Oct 2018 13:40:01 +0600
Subject: [PATCH 24/74] Organized the AddSalesApi

---
 server/src/apis/add-sales.js | 80 ++++++++++++++++++++++++++++--------
 1 file changed, 63 insertions(+), 17 deletions(-)

diff --git a/server/src/apis/add-sales.js b/server/src/apis/add-sales.js
index 6b61d0334..01a7999c6 100644
--- a/server/src/apis/add-sales.js
+++ b/server/src/apis/add-sales.js
@@ -28,17 +28,19 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
       ),
 
       payment: Joi.object().keys({
-        totalAmount: Joi.number().max(999999999999999).required(),
+        totalAmount: Joi.number().max(999999999999999).required(), // means total sale price of all products
         vatAmount: Joi.number().max(999999999999999).required(),
         discountType: Joi.string().max(1024).required(),
         discountValue: Joi.number().max(999999999999999).required(),
         discountedAmount: Joi.number().max(999999999999999).required(),
         serviceChargeAmount: Joi.number().max(999999999999999).required(),
-        totalBilled: Joi.number().max(999999999999999).required(),
+        totalBilled: Joi.number().max(999999999999999).required(), // this is the final amount customer has to pay (regardless of the method)
+
+        // NOTE: below is a single payment.
+        paymentMethod: Joi.string().valid('cash', 'card', 'digital', 'change-wallet').required(),
         paidAmount: Joi.number().max(999999999999999).required(),
         changeAmount: Joi.number().max(999999999999999).required(),
-        shouldSaveChangeInAccount: Joi.boolean().required(),
-        paymentMethod: Joi.string().valid('cash', 'card', 'digital', 'change-wallet').required()
+        shouldSaveChangeInAccount: Joi.boolean().required()
       })
 
     });
@@ -60,9 +62,10 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
     }];
   }
 
-  _manualPaymentValidation({ productList, payment }) {
+  async _validatePayment({ productList, payment }) {
     // TODO: should check if adding product(s) salePrice and modifiers (discountedAmount, serviceChargeAmount) equals totalBilled
     // throw new CodedError("BILL_INACCURATE", "Bill is mathematically inaccurate");
+    return;
   }
 
   _reduceProductCountFromOutletDefaultInventory({ outletDefaultInventory, productList }) {
@@ -78,11 +81,45 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
     }
   }
 
-  async _handleReceivedPayment({ userId, payment, customer }) {
+  /**
+    @method _standardizePayment
+    Splits an original payment received from POS into two separate objects.
+      - First one is 'payment' containing the standardized form of payment that can be
+        inserted into database.
+      - Second one is 'newPayment' containing the only the details of current "payment" provided
+        by customer.
+      see the signature of the objects returned for more clarification.
+  */
+  _standardizePayment({ originalPayment }) {
+    let {
+      totalAmount, vatAmount, discountType, discountValue, discountedAmount, serviceChargeAmount,
+      totalBilled,
+      paymentMethod, paidAmount, changeAmount, shouldSaveChangeInAccount
+    } = originalPayment;
+
+    let payment = {
+      totalAmount, vatAmount, discountType, discountValue, discountedAmount, serviceChargeAmount,
+      totalBilled,
+      paymentList: [], totalPaidAmount: 0
+    }
+
+    let newPayment = {
+      createdDatetimeStamp: Date.now(),
+      acceptedByUserId: userId,
+      paymentMethod, paidAmount, changeAmount, shouldSaveChangeInAccount
+    }
+
+    return { payment, newPayment };
+  }
+
+
+  async _processASinglePayment({ userId, payment, customer, newPayment }) {
+
+
+
     let paymentList = [
       {
-        createdDatetimeStamp: (new Date).getTime(),
-        acceptedByUserId: userId,
+
 
         paidAmount: payment.paidAmount,
         changeAmount: payment.changeAmount,
@@ -110,14 +147,13 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
       }
     }
 
-    let { totalAmount, vatAmount, discountType, discountValue, discountedAmount, serviceChargeAmount, totalBilled } = payment;
-    return { totalAmount, vatAmount, discountType, discountValue, discountedAmount, serviceChargeAmount, totalBilled, totalPaidAmount: paymentList[0].paidAmount, paymentList};
   }
 
-  async handle({ userId, body }) {
-    let { outletId, customerId, productList, payment } = body;
-    this._manualPaymentValidation({ productList, payment });
-    
+  async _handleReceivedPayment({ userId, payment: originalPayment, customer }) {
+    return await this._processASinglePayment({ userId, payment, customer, newPayment });
+  }
+
+  async _findCustomerIfSelected({ customerId }) {
     let customer = null;
     if (customerId) {
       customer = await this.database.customer.findById({ id: customerId });
@@ -125,13 +161,23 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
         throw new CodedError("CUSTOMER_INVALID", "Customer not found.");
       }
     }
+    return customer;
+  }
+
+  async handle({ userId, body }) {
+    let { outletId, customerId, productList, payment: originalPayment } = body;
+
+    let customer = this._findCustomerIfSelected({ customerId });
 
     let outletDefaultInventory = await this.__getOutletDefaultInventory({ outletId });
     this._reduceProductCountFromOutletDefaultInventory({ outletDefaultInventory, productList });
-    let standardizedPayment = await this._handleReceivedPayment({ userId, payment, customer });
-    // console.log("standardizedPayment: ", standardizedPayment);
+
+    let { payment, newPayment } = this._standardizePayment({ originalPayment });
+    await this._validatePayment({ productList, payment, newPayment });
+    payment = await this._processASinglePayment({ userId, customer, payment, newPayment });
+
     await this.database.inventory.setProductList({ id: outletDefaultInventory.id }, { productList: outletDefaultInventory.productList });
-    let salesId = await this.database.sales.create({ outletId, customerId, productList, payment: standardizedPayment });
+    let salesId = await this.database.sales.create({ outletId, customerId, productList, payment });
 
     return { status: "success", salesId };
   }

From 9838f672c5f11467a6f91b127434b98a7e948505 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Fri, 5 Oct 2018 14:02:17 +0600
Subject: [PATCH 25/74] shouldSaveReturnableInChangeWallet in edit sales return
 client

---
 client/src/lang-bn-bd.json             |  9 +++++--
 client/src/lang-en-us.json             |  9 +++++--
 client/src/page-add-products.html      |  6 ++---
 client/src/page-edit-sales-return.html | 36 ++++++++++++++++++--------
 client/src/page-view-sales.html        | 15 +++++++++--
 5 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/client/src/lang-bn-bd.json b/client/src/lang-bn-bd.json
index 1ef1934af..d1b9a4f3f 100644
--- a/client/src/lang-bn-bd.json
+++ b/client/src/lang-bn-bd.json
@@ -434,7 +434,9 @@
     "creditedAmount": "ফেরতকৃত অর্থ",
     "productList": "পণ্য তালিকা",
     "product": "পণ্য",
-    "noSalesReturnFound": "কোনো বিক্রয় ফেরত রেকর্ড পাওয়া যায় নি।"
+    "noSalesReturnFound": "কোনো বিক্রয় ফেরত রেকর্ড পাওয়া যায় নি।",
+
+    "shouldSaveReturnableInChangeWallet": "ফেরতযোগ্য অর্থ ক্রেতার ওয়ালেট এ সংরক্ষণ করা হোক?"
   },
   "sales": {
     "manageSalesTitle": "বিক্রয় রেকর্ড",
@@ -466,7 +468,10 @@
     "changeAmount": "ফেরত",
     "wasDebitedToUser": "গ্রাহককে ডেবিট করা হয়েছিল।",
     "allReturned": "সব ফেরত",
-    "noSalesFound": "কোনো বিক্রয় রেকর্ড পাওয়া যায় নি।"
+    "noSalesFound": "কোনো বিক্রয় রেকর্ড পাওয়া যায় নি।",
+
+    "soldCount": "বিক্রয় গণনা",
+    "returnedCount": "ফেরৎ গণনা"
   },
   "warehouse": {
     "editPageTitle": "গুদাম আপডেট করুন",
diff --git a/client/src/lang-en-us.json b/client/src/lang-en-us.json
index ba591e532..f26784af3 100644
--- a/client/src/lang-en-us.json
+++ b/client/src/lang-en-us.json
@@ -432,7 +432,9 @@
     "creditedAmount": "Credited Amount",
     "productList": "Product List",
     "product": "Product",
-    "noSalesReturnFound": "No Sales Return Record Found."
+    "noSalesReturnFound": "No Sales Return Record Found.",
+
+    "shouldSaveReturnableInChangeWallet": "Should save returnable in change wallet?"
   },
   "sales": {
     "manageSalesTitle": "Sales Record",
@@ -464,7 +466,10 @@
     "changeAmount": "Change Amount",
     "wasDebitedToUser": "was debited to user.",
     "allReturned": "all returned",
-    "noSalesFound": "No Sales Record Found."
+    "noSalesFound": "No Sales Record Found.",
+
+    "soldCount": "Sold Count",
+    "returnedCount": "Returned Count"
   },
   "warehouse": {
     "editPageTitle": "Edit Warehouse",
diff --git a/client/src/page-add-products.html b/client/src/page-add-products.html
index ca5e78486..a15a21bfc 100644
--- a/client/src/page-add-products.html
+++ b/client/src/page-add-products.html
@@ -158,13 +158,13 @@
               <div class="horizontal layout item center">
                 <div class="product-title">[[productCategory.name]]</div>
                 <div class="product-category-numeric">
-                  <paper-input class$="small-input id-[[productCategory.id]]" value="{{productCategory.count}}" type="number" min="0" on-input="genericNumericInputChanged" label=[[productCategory.unit]]></paper-input>
+                  <paper-input class$="small-input id-[[productCategory.id]]" value="{{productCategory.count}}" type="number" min="0" on-input="genericNumericInputChanged" on-change="genericNumericInputChanged" label=[[productCategory.unit]]></paper-input>
                 </div>
                 <div class="product-category-numeric">
-                  <paper-input disabled="[[$isDisabled(productCategory.count)]]" class="small-input" min="[[productCategory.purchasePrice]]" on-input="genericNumericInputChanged" value="{{productCategory.salePrice}}" type="number"></paper-input>
+                  <paper-input disabled="[[$isDisabled(productCategory.count)]]" class="small-input" min="[[productCategory.purchasePrice]]" on-input="genericNumericInputChanged" on-change="genericNumericInputChanged" value="{{productCategory.salePrice}}" type="number"></paper-input>
                 </div>
                 <div class="product-category-numeric">
-                  <paper-input disabled="[[$isDisabled(productCategory.count)]]" class="small-input" min="0" on-input="genericNumericInputChanged" value="{{productCategory.purchasePrice}}" type="number"></paper-input>
+                  <paper-input disabled="[[$isDisabled(productCategory.count)]]" class="small-input" min="0" on-input="genericNumericInputChanged" on-change="genericNumericInputChanged" value="{{productCategory.purchasePrice}}" type="number"></paper-input>
                 </div>
               </div>
             </div>
diff --git a/client/src/page-edit-sales-return.html b/client/src/page-edit-sales-return.html
index c3ef0054e..c7b18af1a 100644
--- a/client/src/page-edit-sales-return.html
+++ b/client/src/page-edit-sales-return.html
@@ -40,14 +40,24 @@
             <div>[[productToBeReturned.productCategoryName]]</div>
             <div>[[verses.salesReturn.soldCount]]: [[productToBeReturned.count]]</div>
             <div>[[verses.salesReturn.returnCount]]: [[productToBeReturned.returnedProductCount]]</div>
-            <paper-input class="salesReturnForm--productReturnCount" value="{{salesReturnForm.productReturnCount}}" type="number" required min="1" max="[[maxAllowedReturnCount(productToBeReturned.count, productToBeReturned.returnedProductCount)]]" error-message=[[verses.salesReturn.productReturnCountInputError]] label=[[verses.salesReturn.productReturnCountInput]]></paper-input>
-            <paper-input class="salesReturnForm--creditedAmount" value="{{salesReturnForm.creditedAmount}}" type="number" required min="0" max="[[maxAllowedCreditAmount(productToBeReturned.count, productToBeReturned.returnedProductCount, productToBeReturned.salePrice)]]" error-message=[[verses.salesReturn.creditedAmountInputError]] label=[[verses.salesReturn.creditedAmountInput]]>
+            
+            <paper-input class="salesReturnForm--productReturnCount" value="{{salesReturnForm.productReturnCount}}" type="number" required min="1" max="[[maxAllowedReturnCount(productToBeReturned.count, productToBeReturned.returnedProductCount)]]" on-input="genericNumericInputChanged" on-change="genericNumericInputChanged" error-message=[[verses.salesReturn.productReturnCountInputError]] label=[[verses.salesReturn.productReturnCountInput]]></paper-input>
+            
+            <paper-input class="salesReturnForm--creditedAmount" value="{{salesReturnForm.creditedAmount}}" type="number" required min="0" max="[[maxAllowedCreditAmount(productToBeReturned.count, productToBeReturned.returnedProductCount, productToBeReturned.salePrice)]]" on-input="genericNumericInputChanged" on-change="genericNumericInputChanged" error-message=[[verses.salesReturn.creditedAmountInputError]] label=[[verses.salesReturn.creditedAmountInput]]>
               <div slot="suffix">[[app.settings.monetaryUnit]]</div>
             </paper-input>
+
+            <template is="dom-if" if="sales.customerId">
+              <paper-checkbox checked="{{salesReturnForm.shouldSaveReturnableInChangeWallet}}">
+                [[verses.salesReturn.shouldSaveReturnableInChangeWallet]]
+              </paper-checkbox>
+            </template>
+            
             <div class="horizontal layout button-row end">
               <div class="flex"></div>
               <paper-button raised class="primary salesReturnForm--submit" on-tap="addSalesReturnTapped">[[verses.salesReturn.addSalesReturn]]</paper-button>
             </div>
+
           </div>
         </form>
       </iron-form>
@@ -68,12 +78,14 @@
               if (mode === 'development') {
                 return {
                   productReturnCount: 1,
-                  creditedAmount: 100
+                  creditedAmount: 0,
+                  shouldSaveReturnableInChangeWallet: true
                 };
               } else {
                 return {
-                  productReturnCount: null,
+                  productReturnCount: 0,
                   creditedAmount: 0,
+                  shouldSaveReturnableInChangeWallet: true
                 };
               }
             }
@@ -137,13 +149,11 @@
 
       _processProductToBeReturned(cbfn) {
         this.productToBeReturned = this.sales.productList.find(product => product.productId == this.params.product);
-        this.set("salesReturnForm.creditedAmount", this.productToBeReturned.salePrice * (this.productToBeReturned.count - this.productToBeReturned.returnedProductCount));
         this.set("salesReturnForm.productReturnCount", (this.productToBeReturned.count - this.productToBeReturned.returnedProductCount));
-
         cbfn();
       }
 
-      _processAddSalesReturn({ productReturnCount, creditedAmount }) {
+      _processAddSalesReturn({ productReturnCount, creditedAmount, shouldSaveReturnableInChangeWallet }) {
         let returnedProductList = [
           {
             productId: this.params.product,
@@ -153,7 +163,7 @@
 
         let data = {
           salesId: this.params.sales,
-          returnedProductList, creditedAmount
+          returnedProductList, creditedAmount, shouldSaveReturnableInChangeWallet
         };
 
         this.app.callAddSalesReturnApi(data, (err, response) => {
@@ -177,15 +187,19 @@
       }
 
       maxAllowedCreditAmount(soldCount, returnedCount, salePrice) {
-        return ((soldCount-returnedCount)*salePrice)
+        return ((soldCount-returnedCount)*salePrice);
       }
 
       addSalesReturnTapped(e = null) {
         this.elemAll('#salesReturnForm paper-input').forEach(el => el.autoValidate = true);
         if (!this.elem('#salesReturnForm').validate()) return;
 
-        let { productReturnCount, creditedAmount } = this.salesReturnForm;
-        this._processAddSalesReturn({ productReturnCount, creditedAmount });
+        let { productReturnCount, creditedAmount, shouldSaveReturnableInChangeWallet } = this.salesReturnForm;
+        this._processAddSalesReturn({ productReturnCount, creditedAmount, shouldSaveReturnableInChangeWallet });
+      }
+
+      genericNumericInputChanged(e) {
+        this.enforceMinMaxOnPaperInput(e);
       }
     }
 
diff --git a/client/src/page-view-sales.html b/client/src/page-view-sales.html
index 99d49871e..feb01bead 100644
--- a/client/src/page-view-sales.html
+++ b/client/src/page-view-sales.html
@@ -28,6 +28,11 @@
         width: 100%;
       }
 
+      .return-button {
+        width: 97%;
+        margin: 6px;
+      }
+
       .list-object {
         border: 1px solid #eee;
         background-color: #f7f7f7;
@@ -53,6 +58,7 @@
         <template is="dom-if" if="{{sales.customerId}}">
           <div>[[verses.sales.customerId]]: [[sales.customerId]]</div>
         </template>
+
         <template is="dom-if" if="{{!sales.isDiscarded}}">
           <paper-button raised class="danger discard-button" on-tap="discardTapped">[[verses.general.discard]]</paper-button>
         </template>
@@ -69,13 +75,18 @@
               <div class="list-object">
               
                 <div>[[verses.general.product]]: [[product.productCategoryName]]</div>
-                <div>[[verses.general.count]]: [[product.count]]</div>
+                <div>[[verses.sales.soldCount]]: [[product.count]]</div>
+                <template is="dom-if" if="[[product.returnedProductCount]]">
+                  <div>[[verses.sales.returnedCount]]: [[product.returnedProductCount]]</div>
+                </template>
                 <div>[[verses.sales.salePrice]]: [[product.salePrice]] [[app.settings.monetaryUnit]]</div>
+                
                 <template is="dom-if" if="{{checkIfAllProductReturned(product.returnedProductCount, product.count, product.productCategoryIsReturnable)}}" >
                   *[[verses.sales.allReturned]]
                 </template>
+
                 <template is="dom-if" if="{{checkIfProductReturnable(product.returnedProductCount, product.count, product.productCategoryIsReturnable)}}">
-                  <paper-button raised class="danger discard-button" on-tap="returnTapped">[[verses.general.return]]</paper-button>
+                  <paper-button raised class="danger return-button" on-tap="returnTapped">[[verses.general.return]]</paper-button>
                 </template>
 
               </div>

From 2c224f031f30afaa0e27648dc8fc95e3b7edcf60 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Fri, 5 Oct 2018 14:19:30 +0600
Subject: [PATCH 26/74] shouldSaveReturnableInChangeWallet in sarver

---
 server/src/legacy-apis/add-sales-return.js |  4 +++-
 server/test/test-sales-apis.js             |  5 +++--
 server/test/test-sales-return-apis.js      | 12 ++++++++----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/server/src/legacy-apis/add-sales-return.js b/server/src/legacy-apis/add-sales-return.js
index 6fa1b92ea..43b484ed0 100644
--- a/server/src/legacy-apis/add-sales-return.js
+++ b/server/src/legacy-apis/add-sales-return.js
@@ -25,7 +25,9 @@ exports.AddSalesReturnApi = class extends salesCommonMixin(inventoryCommonMixin(
           count: Joi.number().max(999999999999999).required()
         })
       ),
-      creditedAmount: Joi.number().max(999999999999999).required()
+
+      creditedAmount: Joi.number().max(999999999999999).required(),
+      shouldSaveReturnableInChangeWallet: Joi.boolean().required()
     });
   }
 
diff --git a/server/test/test-sales-apis.js b/server/test/test-sales-apis.js
index 01d761f2f..7b65aa578 100644
--- a/server/test/test-sales-apis.js
+++ b/server/test/test-sales-apis.js
@@ -82,7 +82,7 @@ let fromDate = new Date();
 fromDate.setDate(fromDate.getDate() - 1);
 fromDate = fromDate.getTime();
 
-describe.only('Sales', _ => {
+describe('Sales', _ => {
 
   it('START', testDoneFn => {
     initializeServer(_ => {
@@ -531,7 +531,8 @@ describe.only('Sales', _ => {
             count: salesData.productList[0].count - 1
           }
         ],
-        creditedAmount: 100
+        creditedAmount: 100,
+        shouldSaveReturnableInChangeWallet: false
       }
     }, (err, response, body) => {
       expect(response.statusCode).to.equal(200);
diff --git a/server/test/test-sales-return-apis.js b/server/test/test-sales-return-apis.js
index 6d6816175..148d67903 100644
--- a/server/test/test-sales-return-apis.js
+++ b/server/test/test-sales-return-apis.js
@@ -274,7 +274,8 @@ describe('Sales Return', _ => {
             count: salesData.productList[0].count
           }
         ],
-        creditedAmount: 100 // TODO: use data from salesData.payment
+        creditedAmount: 100, // TODO: use data from salesData.payment
+        shouldSaveReturnableInChangeWallet: false
       }
     }, (err, response, body) => {
       expect(response.statusCode).to.equal(200);
@@ -297,7 +298,8 @@ describe('Sales Return', _ => {
             count: 10
           }
         ],
-        creditedAmount: 100 // TODO: use data from salesData.payment
+        creditedAmount: 100, // TODO: use data from salesData.payment
+        shouldSaveReturnableInChangeWallet: false
       }
     }, (err, response, body) => {
       expect(response.statusCode).to.equal(200);
@@ -320,7 +322,8 @@ describe('Sales Return', _ => {
             count: salesData.productList[0].count
           }
         ],
-        creditedAmount: 100 // TODO: use data from salesData.payment
+        creditedAmount: 100, // TODO: use data from salesData.payment
+        shouldSaveReturnableInChangeWallet: false
       }
     }, (err, response, body) => {
       expect(response.statusCode).to.equal(200);
@@ -343,7 +346,8 @@ describe('Sales Return', _ => {
             count: sales2Data.productList[0].count
           }
         ],
-        creditedAmount: 300 // TODO: use data from salesData.payment
+        creditedAmount: 300, // TODO: use data from salesData.payment
+        shouldSaveReturnableInChangeWallet: false
       }
     }, (err, response, body) => {
       expect(response.statusCode).to.equal(200);

From 587c4d17bb6f024cf34f1a04f34b4ae80cacffdb Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Fri, 5 Oct 2018 14:26:15 +0600
Subject: [PATCH 27/74] Updated AddSalesApi (calculation and a moved
 validation)

---
 server/src/apis/add-sales.js | 58 +++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/server/src/apis/add-sales.js b/server/src/apis/add-sales.js
index 01a7999c6..a44b5e31c 100644
--- a/server/src/apis/add-sales.js
+++ b/server/src/apis/add-sales.js
@@ -62,9 +62,14 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
     }];
   }
 
-  async _validatePayment({ productList, payment }) {
+  async _validateBillingAndPayment({ productList, payment, newPayment, customer }) {
     // TODO: should check if adding product(s) salePrice and modifiers (discountedAmount, serviceChargeAmount) equals totalBilled
     // throw new CodedError("BILL_INACCURATE", "Bill is mathematically inaccurate");
+    // Also should validate the new payment portion. i.e. paidAmount > changeAmount etc
+    // Also, if paymentMethod is 'change-wallet' then customer must exist
+    if (payment.totalBilled > (payment.totalPaidAmount + newPayment.paidAmount)) {
+      throwOnFalsy(customer, "CREDIT_SALE_NOT_ALLOWED_WITHOUT_CUSTOMER", "credit sale is not allowed without registered cutomer");
+    }
     return;
   }
 
@@ -90,7 +95,7 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
         by customer.
       see the signature of the objects returned for more clarification.
   */
-  _standardizePayment({ originalPayment }) {
+  _standardizePayment({ originalPayment, userId }) {
     let {
       totalAmount, vatAmount, discountType, discountValue, discountedAmount, serviceChargeAmount,
       totalBilled,
@@ -114,38 +119,31 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
 
 
   async _processASinglePayment({ userId, payment, customer, newPayment }) {
+    // NOTE: At this point, all of above fields are validated and completely trustworthy.
 
+    // NOTE: since paidAmount includes changeAmount, we confirmed after discussion.
+    let paidAmountWithoutChange = (newPayment.paidAmount - newPayment.changeAmount);
 
-
-    let paymentList = [
-      {
-
-
-        paidAmount: payment.paidAmount,
-        changeAmount: payment.changeAmount,
-        paymentMethod: payment.paymentMethod,
-        wasChangeSavedInChangeWallet: false
-      }
-    ];
-
-    if (payment.totalBilled > payment.paidAmount) {
-      // console.log("payment.totalBilled > payment.paidAmount");
-      if (!customer) {
-        throw new CodedError("CREDIT_SALE_NOT_ALLOWED_WITHOUT_CUSTOMER", "credit sale is not allowed without registered cutomer");
-      }
+    if (newPayment.paymentMethod === 'change-wallet') {
+      await this._deductFromChangeWalletAsPayment({ customerId: customer.id, amount: paidAmountWithoutChange });
     }
 
-    if (payment.totalBilled === payment.paidAmount) {
-      // console.log("payment.totalBilled === payment.paidAmount");
+    payment.totalPaidAmount += paidAmountWithoutChange;
+    let wasChangeSavedInChangeWallet = false;
+    if (newPayment.changeAmount && newPayment.shouldSaveChangeInAccount) {
+      wasChangeSavedInChangeWallet = true;
+      await this._addChangeToChangeWallet({ customerId: customer.id, amount: newPayment.changeAmount });
     }
 
-    if (payment.totalBilled < payment.paidAmount) {
-      // console.log("payment.totalBilled < payment.paidAmount");
-      if (customer && payment.shouldSaveChangeInAccount) {
-        paymentList[0].wasChangeSavedInChangeWallet = true;
-        await this._setCustomerChangeWalletBalance({ customer, changeWalletBalance: (customer.changeWalletBalance + payment.paidAmount - payment.totalBilled) });
-      }
-    }
+    let {
+      createdDatetimeStamp, acceptedByUserId, paymentMethod, paidAmount, changeAmount
+    } = newPayment;
+    payment.paymentList.push({
+      createdDatetimeStamp, acceptedByUserId, paymentMethod, paidAmount, changeAmount,
+      wasChangeSavedInChangeWallet
+    });
+
+    return payment;
 
   }
 
@@ -172,8 +170,8 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
     let outletDefaultInventory = await this.__getOutletDefaultInventory({ outletId });
     this._reduceProductCountFromOutletDefaultInventory({ outletDefaultInventory, productList });
 
-    let { payment, newPayment } = this._standardizePayment({ originalPayment });
-    await this._validatePayment({ productList, payment, newPayment });
+    let { payment, newPayment } = this._standardizePayment({ originalPayment, userId });
+    await this._validateBillingAndPayment({ productList, payment, newPayment, customer });
     payment = await this._processASinglePayment({ userId, customer, payment, newPayment });
 
     await this.database.inventory.setProductList({ id: outletDefaultInventory.id }, { productList: outletDefaultInventory.productList });

From aedd40aacb21a98ef2deccdf5f752721e0a489fa Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Fri, 5 Oct 2018 14:28:04 +0600
Subject: [PATCH 28/74] view sales return

---
 client/src/lang-bn-bd.json               |  3 ++-
 client/src/lang-en-us.json               |  3 ++-
 client/src/page-manage-sales-return.html | 21 ++++++++++++++++++---
 client/src/page-manage-sales.html        |  2 ++
 client/src/page-view-sales-return.html   | 23 ++++++++++++++++-------
 5 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/client/src/lang-bn-bd.json b/client/src/lang-bn-bd.json
index d1b9a4f3f..a71031d5b 100644
--- a/client/src/lang-bn-bd.json
+++ b/client/src/lang-bn-bd.json
@@ -436,7 +436,8 @@
     "product": "পণ্য",
     "noSalesReturnFound": "কোনো বিক্রয় ফেরত রেকর্ড পাওয়া যায় নি।",
 
-    "shouldSaveReturnableInChangeWallet": "ফেরতযোগ্য অর্থ ক্রেতার ওয়ালেট এ সংরক্ষণ করা হোক?"
+    "shouldSaveReturnableInChangeWallet": "ফেরতযোগ্য অর্থ ক্রেতার ওয়ালেট এ সংরক্ষণ করা হোক?",
+    "returnedCount": "ফেরৎ গণনা"
   },
   "sales": {
     "manageSalesTitle": "বিক্রয় রেকর্ড",
diff --git a/client/src/lang-en-us.json b/client/src/lang-en-us.json
index f26784af3..54d674864 100644
--- a/client/src/lang-en-us.json
+++ b/client/src/lang-en-us.json
@@ -434,7 +434,8 @@
     "product": "Product",
     "noSalesReturnFound": "No Sales Return Record Found.",
 
-    "shouldSaveReturnableInChangeWallet": "Should save returnable in change wallet?"
+    "shouldSaveReturnableInChangeWallet": "Should save returnable in change wallet?",
+    "returnedCount": "Returned Count"
   },
   "sales": {
     "manageSalesTitle": "Sales Record",
diff --git a/client/src/page-manage-sales-return.html b/client/src/page-manage-sales-return.html
index 5929f964a..dbb547b7b 100644
--- a/client/src/page-manage-sales-return.html
+++ b/client/src/page-manage-sales-return.html
@@ -25,7 +25,17 @@
 
 <dom-module id="page-manage-sales-return">
   <template>
-    <style include="shared-styles"></style>
+    <style include="shared-styles">
+    
+      .description {
+          font-size: 15px;
+        }
+
+      .description-time {
+        font-size: 12px;
+      }
+
+    </style>
 
     <elem-not-ready is-ready="[[isReady]]"></elem-not-ready>
 
@@ -99,14 +109,19 @@
 
           <div class="list">
             <template is="dom-repeat" items="[[salesReturnList]]" as="saleReturn">
+
               <div class="horizontal layout item center">
                 <div class="vertical layout flex">
+
                   <div class="title">[[verses.salesReturn.salesId]]: [[saleReturn.salesId]]</div>
-                  <div class="description">[[$mkDate(saleReturn.createdDatetimeStamp, 'hh:mmtt dd-MM-yyyy')]]</div>
-                  <div class="description">[[verses.salesReturn.credited]] [[$round(saleReturn.creditedAmount)]] [[app.settings.monetaryUnit]]</div>
+                  <div class="description-time">[[$mkDate(saleReturn.createdDatetimeStamp, 'hh:mmtt dd-MM-yyyy')]]</div>
+                  <div class="description">[[verses.salesReturn.credited]]: [[$round(saleReturn.creditedAmount)]] [[app.settings.monetaryUnit]]</div>
+                  <div class="description">[[verses.salesReturn.returnedCount]]: [[saleReturn.returnedProductList.length]]</div>
+                
                 </div>
                 <paper-button raised class="secondary" on-tap="viewTapped">[[verses.general.view]]</paper-button>
               </div>
+          
             </template>
           </div>
 
diff --git a/client/src/page-manage-sales.html b/client/src/page-manage-sales.html
index 81fd868f0..e6742f7c4 100644
--- a/client/src/page-manage-sales.html
+++ b/client/src/page-manage-sales.html
@@ -114,10 +114,12 @@
             <template is="dom-repeat" items="[[salesList]]" as="sale">
               <div class="horizontal layout item center">
                 <div class="vertical layout flex">
+
                   <div class="title">[[verses.sales.salesId]]: [[sale.id]]</div>
                   <div class="description-time">[[$mkDate(sale.createdDatetimeStamp, 'hh:mmtt dd-MM-yyyy')]]</div>
                   <div class="description">[[verses.sales.billed]]: [[$round(sale.payment.totalBilled)]] [[app.settings.monetaryUnit]], [[verses.sales.paid]]: [[$round(sale.payment.totalPaidAmount)]] [[app.settings.monetaryUnit]]</div>
                   <div class="description">[[sale.productList.length]] [[verses.sales.products]]</div>
+                
                 </div>
                 <paper-button raised class="secondary" on-tap="viewTapped">[[verses.general.view]]</paper-button>
               </div>
diff --git a/client/src/page-view-sales-return.html b/client/src/page-view-sales-return.html
index 4b82bb9de..31e7955d2 100644
--- a/client/src/page-view-sales-return.html
+++ b/client/src/page-view-sales-return.html
@@ -22,7 +22,16 @@
 
 <dom-module id="page-view-sales-return">
   <template>
-    <style include="shared-styles"></style>
+    <style include="shared-styles">
+    
+      .list-object {
+        border: 1px solid #eee;
+        background-color: #f7f7f7;
+        padding: 6px;
+        margin: 4px 0px;
+      }
+    
+    </style>
 
     <elem-not-ready is-ready="[[isReady]]"></elem-not-ready>
 
@@ -39,15 +48,15 @@
 
       <div class="card vertical layout">
         <div class="title">
-          <b>[[verses.salesReturn.productList]]: ([[salesReturn.returnedProductList.length]] products)</b>
+          <b>[[verses.salesReturn.productList]]:</b>
         </div>
         <div class="list">
           <template is="dom-repeat" items="{{salesReturn.returnedProductList}}" as="returnedProduct">
-            <div class="horizontal layout item center">
-              <div class="vertical layout flex">
-                <div>[[verses.salesReturn.product]]: [[returnedProduct.productCategoryName]]</div>
-                <div>[[verses.general.count]]: [[returnedProduct.count]]</div>
-              </div>
+            <div class="list-object">
+              
+              <div>[[verses.salesReturn.product]]: [[returnedProduct.productCategoryName]]</div>
+              <div>[[verses.salesReturn.returnedCount]]: [[returnedProduct.count]]</div>
+              
             </div>
           </template>
         </div>

From 2074ccef89668d3d60c2d90097823ba0ec013fdf Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Fri, 5 Oct 2018 15:09:40 +0600
Subject: [PATCH 29/74] Updated AddSalesApi and CustomerMixin #407 (All tests
 passing)

---
 server/src/apis/add-sales.js             | 10 ++----
 server/src/apis/mixins/customer-mixin.js | 42 ++++++++++++++++++++++--
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/server/src/apis/add-sales.js b/server/src/apis/add-sales.js
index a44b5e31c..54c3d56d9 100644
--- a/server/src/apis/add-sales.js
+++ b/server/src/apis/add-sales.js
@@ -125,14 +125,14 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
     let paidAmountWithoutChange = (newPayment.paidAmount - newPayment.changeAmount);
 
     if (newPayment.paymentMethod === 'change-wallet') {
-      await this._deductFromChangeWalletAsPayment({ customerId: customer.id, amount: paidAmountWithoutChange });
+      await this._deductFromChangeWalletAsPayment({ customer, amount: paidAmountWithoutChange });
     }
 
     payment.totalPaidAmount += paidAmountWithoutChange;
     let wasChangeSavedInChangeWallet = false;
     if (newPayment.changeAmount && newPayment.shouldSaveChangeInAccount) {
       wasChangeSavedInChangeWallet = true;
-      await this._addChangeToChangeWallet({ customerId: customer.id, amount: newPayment.changeAmount });
+      await this._addChangeToChangeWallet({ customer, amount: newPayment.changeAmount });
     }
 
     let {
@@ -147,10 +147,6 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
 
   }
 
-  async _handleReceivedPayment({ userId, payment: originalPayment, customer }) {
-    return await this._processASinglePayment({ userId, payment, customer, newPayment });
-  }
-
   async _findCustomerIfSelected({ customerId }) {
     let customer = null;
     if (customerId) {
@@ -165,7 +161,7 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
   async handle({ userId, body }) {
     let { outletId, customerId, productList, payment: originalPayment } = body;
 
-    let customer = this._findCustomerIfSelected({ customerId });
+    let customer = await this._findCustomerIfSelected({ customerId });
 
     let outletDefaultInventory = await this.__getOutletDefaultInventory({ outletId });
     this._reduceProductCountFromOutletDefaultInventory({ outletDefaultInventory, productList });
diff --git a/server/src/apis/mixins/customer-mixin.js b/server/src/apis/mixins/customer-mixin.js
index 0645a0e60..0cf7cae0e 100644
--- a/server/src/apis/mixins/customer-mixin.js
+++ b/server/src/apis/mixins/customer-mixin.js
@@ -2,10 +2,46 @@ const { throwOnFalsy, throwOnTruthy, CodedError } = require('../../utils/coded-e
 
 exports.CustomerMixin = (SuperApiClass) => class extends SuperApiClass {
 
-  async _setCustomerChangeWalletBalance({ customer, changeWalletBalance }) {
+  async _deductFromChangeWalletAsPayment({ customer, amount }) {
+    if (amount < 0) throw new CodedError("NEGATIVE_AMOUNT_GIVEN", "amount cannot be negative");
+    if (customer.changeWalletBalance < amount) {
+      throw new CodedError("INSUFFICIENT_BALANCE", "Customer does not have enough balance to pay this amount");
+    }
+
+    let changeWalletBalance = customer.changeWalletBalance;
+    changeWalletBalance -= amount;
     let doc = await this.database.customer.setChangeWalletBalance({ id: customer.id }, { changeWalletBalance });
     throwOnFalsy(doc, "UNABLE_TO_UPDATE_CUSTOMER_CHANGE_WALLET_BALANCE", "Unable to update customer change wallet balance");
-    return;
   }
-  
+
+  async _addChangeToChangeWallet({ customer, amount }) {
+    if (amount < 0) throw new CodedError("NEGATIVE_AMOUNT_GIVEN", "amount cannot be negative");
+
+    let changeWalletBalance = customer.changeWalletBalance;
+    changeWalletBalance += amount;
+    let doc = await this.database.customer.setChangeWalletBalance({ id: customer.id }, { changeWalletBalance });
+    throwOnFalsy(doc, "UNABLE_TO_UPDATE_CUSTOMER_CHANGE_WALLET_BALANCE", "Unable to update customer change wallet balance");
+  }
+
+  async _deductFromChangeWalletAsManualWithdrawal({ customer, amount, byUserId }) {
+    if (amount < 0) throw new CodedError("NEGATIVE_AMOUNT_GIVEN", "amount cannot be negative");
+    if (customer.changeWalletBalance < amount) {
+      throw new CodedError("INSUFFICIENT_BALANCE", "Customer does not have enough balance to withdraw this amount");
+    }
+
+    let changeWalletBalance = customer.changeWalletBalance;
+    changeWalletBalance -= amount;
+    let doc = await this.database.customer.setChangeWalletBalance({ id: customer.id }, { changeWalletBalance });
+    throwOnFalsy(doc, "UNABLE_TO_UPDATE_CUSTOMER_CHANGE_WALLET_BALANCE", "Unable to update customer change wallet balance");
+    
+    let withdrawalHistory = customer.withdrawalHistory;
+    withdrawalHistory.push({
+      creditedDatetimeStamp: Date.now(),
+      byUserId,
+      amount
+    });
+    doc = await this.database.customer.setWithdrawalHistory({ id: customer.id }, { withdrawalHistory });
+    throwOnFalsy(doc, "UNABLE_TO_UPDATE_CUSTOMER_CHANGE_WALLET_BALANCE", "Unable to update customer change wallet balance");
+  }
+
 }
\ No newline at end of file

From 6a80da55d25314d1d5b015d1776b2da4ffd5e160 Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Fri, 5 Oct 2018 16:44:17 +0600
Subject: [PATCH 30/74] Working on reusable "elem-additional-payment" for
 page-veiw-sales #418 #407

---
 client/src/elem-additional-payment.html | 170 ++++++++++++++++++++++++
 client/src/page-view-sales.html         |  24 +++-
 2 files changed, 187 insertions(+), 7 deletions(-)
 create mode 100644 client/src/elem-additional-payment.html

diff --git a/client/src/elem-additional-payment.html b/client/src/elem-additional-payment.html
new file mode 100644
index 000000000..e92f99dd7
--- /dev/null
+++ b/client/src/elem-additional-payment.html
@@ -0,0 +1,170 @@
+<link rel="import" href="../bower_components/polymer/polymer-element.html">
+<link rel="import" href="../bower_components/paper-button/paper-button.html">
+<link rel="import" href="../bower_components/paper-input/paper-input.html">
+<link rel="import" href="../bower_components/paper-input/paper-textarea.html">
+<link rel="import" href="../bower_components/paper-tabs/paper-tabs.html">
+<link rel="import" href="../bower_components/paper-tabs/paper-tab.html">
+<link rel="import" href="../bower_components/paper-checkbox/paper-checkbox.html">
+<link rel="import" href="../bower_components/iron-form/iron-form.html">
+<link rel="import" href="../bower_components/iron-icons/iron-icons.html">
+<link rel="import" href="../bower_components/iron-icons/hardware-icons.html">
+<link rel="import" href="../bower_components/iron-icons/editor-icons.html">
+
+<link rel="import" href="../bower_components/paper-dropdown-menu/paper-dropdown-menu.html">
+<link rel="import" href="../bower_components/paper-listbox/paper-listbox.html">
+<link rel="import" href="../bower_components/paper-item/paper-item.html">
+
+<link rel="import" href="../bower_components/baselib/baselib.html">
+
+<link rel="import" href="../bower_components/polymer-fx/fx-page.html">
+<link rel="import" href="../bower_components/polymer-fx/fx-common-behavior.html">
+
+<link rel="import" href="torque-db-behavior.html">
+<link rel="import" href="torque-common-behavior.html">
+<link rel="import" href="torque-language-behavior.html">
+
+<link rel="import" href="shared-styles.html">
+
+<dom-module id="elem-additional-payment">
+  <template>
+    <style include="shared-styles">
+      .individual-calculation-field-container {
+        border: 1px solid #eee;
+        background-color: #f7f7f7;
+        padding: 6px;
+        margin: 8px 0px;
+      }
+    </style>
+    <div class="card p-0 vertical layout">
+      <!-- 
+      <div class="p-16 horizontal layout center">
+        <paper-input class="flex" value="{{searchString}}" required minlength="0" error-message=[[verses.customerSelector.customerNameOrPhoneInputError]] label=[[verses.customerSelector.customerNameOrPhoneInput]] on-keypress="searchFieldKeypressed"></paper-input>
+        <paper-icon-button icon="clear" on-tap="cancelTapped"></paper-icon-button>
+        <paper-button raised class="primary" on-tap="searchTapped">
+          [[verses.general.search]]
+        </paper-button>
+      </div>
+
+      <paper-listbox>
+        <template is="dom-repeat" items="[[customerList]]" as="customer" index-as="customerIndex">
+          <paper-item class="custom layout horizontal center">
+            <div class="flex">
+              <div class="type body capitalize">[[customer.fullName]]</div>
+              <div class="horizontal layout wrap type secondary">
+                <div class="horizontal layout center m-right-8">
+                  <iron-icon icon="hardware:smartphone" class="icon small"></iron-icon>
+                  <div class="type caption-2">[[customer.phone]]</div>
+                </div>
+                <div class="horizontal layout center">
+                  <iron-icon icon="editor:attach-money" class="icon small"></iron-icon>
+                  <div class="type caption-2">[[customer.changeWalletBalance]] [[page.app.settings.monetaryUnit]]</div>
+                </div>
+              </div>
+            </div>
+            <paper-button raised class="primary btn btn-default" on-tap="selectTapped">[[verses.general.select]]</paper-button>
+          </paper-item>
+      </paper-listbox>
+      </template> -->
+
+      <div class="list">
+
+        <div class="individual-calculation-field-container">
+          Due amount:
+          <b>{{$round(amountLeftToPay)}} [[page.app.settings.monetaryUnit]]</b>
+        </div>
+
+        <div class="individual-calculation-field-container">
+
+          <paper-dropdown-menu class="full-width-paper-dropdown" label="[[verses.pos.paymentMethod]]" class="mr-4" on-iron-select="paymentMethodSelected">
+            <paper-listbox slot="dropdown-content" selected="{{payment.paymentMethod}}" attr-for-selected="name">
+              <paper-item name="cash">[[verses.general.cash]]</paper-item>
+              <paper-item name="card">[[verses.general.card]]</paper-item>
+              <paper-item name="digital">[[verses.general.digital]]</paper-item>
+              <template is="dom-if" if="[[customer]]">
+                <paper-item name="change-wallet">change wallet</paper-item>
+              </template>
+            </paper-listbox>
+          </paper-dropdown-menu>
+
+          <template is="dom-if" if="[[!isPaymentMethodChangeWallet(payment.paymentMethod)]]">
+            <paper-input class="payment--paidAmount" value="{{payment.paidAmount}}" on-input="genericPaymentInputChanged" on-change="genericPaymentInputChanged" type="number" required min="0" error-message="[[verses.pos.paidAmountInputError]]" label="[[verses.pos.paidAmountInput]]">
+              <div slot="suffix">[[app.settings.monetaryUnit]]</div>
+            </paper-input>
+          </template>
+
+
+          <template is="dom-if" if="[[payment.changeAmount]]">
+            <br> [[verses.pos.changeAmount]]:
+            <b>{{$round(payment.changeAmount)}} [[app.settings.monetaryUnit]]</b>
+
+            <br>
+            <template is="dom-if" if="[[customer]]">
+              <template is="dom-if" if="[[payment.changeAmount]]">
+                <paper-checkbox checked="{{payment.shouldSaveChangeInAccount}}">
+                  [[verses.pos.shouldSaveChangeInAccount]]
+                </paper-checkbox>
+              </template>
+            </template>
+          </template>
+
+
+        </div>
+
+        <div class="horizontal layout m-top-16">
+          <paper-button raised class="primary flex" on-tap="saveSaleTapped">[[verses.pos.confirmSales]]</paper-button>
+        </div>
+
+      </div>
+  </template>
+  <script>
+    class ElemAdditionalPayment extends FxElement.mixin(TorqueLanguageBehavior, TorqueCommonBehavior) {
+
+      static get is() { return 'elem-additional-payment'; }
+
+      static get properties() {
+        return {
+          amountLeftToPay: {
+            type: Number,
+            value: 0
+          },
+          page: {
+            type: Object,
+            value: null,
+            observer: 'pageChanged'
+          },
+          payment: {
+            type: Object,
+            value: () => {
+              return {
+                paymentMethod: 'cash',
+                paidAmount: 0,
+                changeAmount: 0,
+                shouldSaveChangeInAccount: false
+              }
+            }
+          }
+        };
+      }
+
+      pageChanged() {
+        this.useLanguageServices();
+        if (!this.page) return;
+      }
+
+
+      paymentMethodSelected(e) {
+        // NOTE: The timeout should not be necessary. However, without it
+        // the value of this.payment.paymentMethod is not being updated in time.
+        window.setTimeout(() => {
+          // this._calculatePayment();
+        }, 100);
+      }
+
+      isPaymentMethodChangeWallet(paymentMethod) {
+        return (paymentMethod === 'change-wallet');
+      }
+
+    }
+    window.customElements.define(ElemAdditionalPayment.is, ElemAdditionalPayment);
+  </script>
+</dom-module>
\ No newline at end of file
diff --git a/client/src/page-view-sales.html b/client/src/page-view-sales.html
index feb01bead..eb82e8698 100644
--- a/client/src/page-view-sales.html
+++ b/client/src/page-view-sales.html
@@ -17,12 +17,13 @@
 <link rel="import" href="torque-common-behavior.html">
 <link rel="import" href="torque-page-behavior.html">
 
+<link rel="import" href="elem-additional-payment.html">
+
 <link rel="import" href="shared-styles.html">
 
 <dom-module id="page-view-sales">
   <template>
     <style include="shared-styles">
-    
       .discard-button {
         margin-top: 5px;
         width: 100%;
@@ -43,7 +44,6 @@
       .dated {
         font-size: 12px;
       }
-
     </style>
 
     <elem-not-ready is-ready="[[isReady]]"></elem-not-ready>
@@ -51,7 +51,7 @@
     <div class$="page layout vertical [[$if(isReady, '', 'hidden')]]" id="wrapper">
 
       <div class="card vertical layout">
-        
+
         <div>[[verses.general.id]]: [[sales.id]]</div>
         <div>[[verses.general.dated]]: [[$mkDate(sales.createdDatetimeStamp, 'hh:mmtt dd-MM-yyyy')]]</div>
         <div>[[verses.sales.outletId]]: [[sales.outletId]]</div>
@@ -62,7 +62,7 @@
         <template is="dom-if" if="{{!sales.isDiscarded}}">
           <paper-button raised class="danger discard-button" on-tap="discardTapped">[[verses.general.discard]]</paper-button>
         </template>
-        
+
       </div>
 
       <div class="card vertical layout">
@@ -73,15 +73,15 @@
           <template is="dom-repeat" items="{{sales.productList}}" as="product">
             <div class="vertical layout flex">
               <div class="list-object">
-              
+
                 <div>[[verses.general.product]]: [[product.productCategoryName]]</div>
                 <div>[[verses.sales.soldCount]]: [[product.count]]</div>
                 <template is="dom-if" if="[[product.returnedProductCount]]">
                   <div>[[verses.sales.returnedCount]]: [[product.returnedProductCount]]</div>
                 </template>
                 <div>[[verses.sales.salePrice]]: [[product.salePrice]] [[app.settings.monetaryUnit]]</div>
-                
-                <template is="dom-if" if="{{checkIfAllProductReturned(product.returnedProductCount, product.count, product.productCategoryIsReturnable)}}" >
+
+                <template is="dom-if" if="{{checkIfAllProductReturned(product.returnedProductCount, product.count, product.productCategoryIsReturnable)}}">
                   *[[verses.sales.allReturned]]
                 </template>
 
@@ -119,6 +119,11 @@
 
       </div>
 
+      <template is="dom-if" if="[[$shouldTakeAdditionalPayment(sales.payment.totalBilled,  sales.payment.totalPaidAmount)]]">
+        <elem-additional-payment amount-left-to-pay="[[amountLeftToPay]]" page="[[page]]" customer="[[customer]]">
+          </elem-additional-paymentt>
+      </template>
+
       <template is="dom-if" if="{{sales.customerId}}">
         <div class="card vertical layout">
           <div>[[verses.customer.customerName]] [[customer.fullName]]</div>
@@ -246,6 +251,11 @@
 
       // region: misc =================================
 
+      $shouldTakeAdditionalPayment(totalBilled, totalPaidAmount) {
+        this.amountLeftToPay = (totalBilled - totalPaidAmount);
+        return this.amountLeftToPay > 0;
+      }
+
     }
 
     window.customElements.define(PageViewSales.is, PageViewSales);

From 3be6cbc96afcdee3aefe2fd576fc832308bbe33e Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Sat, 6 Oct 2018 13:33:20 +0600
Subject: [PATCH 31/74] all tests passing

---
 meta/server-db-docs/sales-return.md           |  4 +-
 server/src/apis/add-sales-return.js           | 72 +++++++++++++++++++
 server/src/apis/mixins/inventory-mixin.js     |  7 ++
 server/src/collections/sales-return.js        |  4 +-
 server/src/index.js                           |  1 +
 server/src/legacy-apis/add-sales-return.js    | 37 ++--------
 server/src/legacy-collections/sales-return.js |  4 +-
 server/test/lib.js                            |  2 +
 server/test/test-sales-return-apis.js         |  4 +-
 9 files changed, 98 insertions(+), 37 deletions(-)
 create mode 100644 server/src/apis/add-sales-return.js

diff --git a/meta/server-db-docs/sales-return.md b/meta/server-db-docs/sales-return.md
index 1cc6d15ed..ea4b8e029 100644
--- a/meta/server-db-docs/sales-return.md
+++ b/meta/server-db-docs/sales-return.md
@@ -12,6 +12,8 @@ Joi.object().keys({
       count: Joi.number().max(999999999999999).required()
     })
   ),
-  creditedAmount: Joi.number().max(999999999999999).required()
+
+  creditedAmount: Joi.number().max(999999999999999).required(),
+  returnableWasSavedInChangeWallet: Joi.boolean().required()
 });
 ```
\ No newline at end of file
diff --git a/server/src/apis/add-sales-return.js b/server/src/apis/add-sales-return.js
new file mode 100644
index 000000000..a15242085
--- /dev/null
+++ b/server/src/apis/add-sales-return.js
@@ -0,0 +1,72 @@
+const { Api } = require('./../api-base');
+const Joi = require('joi');
+const { throwOnFalsy, throwOnTruthy, CodedError } = require('./../utils/coded-error');
+const { extract } = require('./../utils/extract');
+const { InventoryMixin } = require('./mixins/inventory-mixin');
+const { CustomerMixin } = require('./mixins/customer-mixin');
+
+exports.AddSalesReturnApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
+
+  get autoValidates() { return true; }
+
+  get requiresAuthentication() { return true; }
+
+  get requestSchema() {
+    return Joi.object().keys({
+
+      salesId: Joi.number().max(999999999999999).required(),
+
+      returnedProductList: Joi.array().items(
+        Joi.object().keys({
+          productId: Joi.number().max(999999999999999).required(),
+          count: Joi.number().max(999999999999999).required()
+        })
+      ),
+
+      creditedAmount: Joi.number().max(999999999999999).required(),
+      shouldSaveReturnableInChangeWallet: Joi.boolean().required()
+
+    });
+  }
+
+  get accessControl() {
+    return [{
+      organizationBy: [
+        {
+          from: "sales",
+          query: ({ salesId }) => ({ id: salesId }),
+          select: "outletId",
+          errorCode: "SALES_INVALID"
+        },
+        {
+          from: "outlet",
+          query: ({ outletId }) => ({ id: outletId }),
+          select: "organizationId"
+        }
+      ],
+      privileges: [
+        "PRIV_ACCESS_POS"
+      ]
+    }];
+  }
+
+  async handle({ body }) {
+    let { salesId, returnedProductList, creditedAmount, shouldSaveReturnableInChangeWallet } = body;
+
+    let sales = await this.database.sales.findById({ salesId });
+    // _verifyProductsExist in returnedProductList
+    // _verifyProductsAreReturnable in returnedProductList
+    let outletReturnedInventory = await this.__getOutletReturnedInventory({ outletId: salesId.outletId });
+    
+    if (shouldSaveReturnableInChangeWallet && sales.customerId && creditedAmount) {
+      let customer = await this.database.customer.findById({ id: sales.customerId });
+      await this._addChangeToChangeWallet({ customer, amount: creditedAmount });
+    }
+
+    // _returnProducts to outletReturnedInventory
+    let salesReturnId = await this.database.salesReturn.create({ salesId, returnedProductList, creditedAmount, shouldSaveReturnableInChangeWallet });
+    
+    return { status: "success", salesReturnId };
+  }
+
+}
\ No newline at end of file
diff --git a/server/src/apis/mixins/inventory-mixin.js b/server/src/apis/mixins/inventory-mixin.js
index d43aaa62b..89f494ff1 100644
--- a/server/src/apis/mixins/inventory-mixin.js
+++ b/server/src/apis/mixins/inventory-mixin.js
@@ -15,6 +15,13 @@ exports.InventoryMixin = (SuperApiClass) => class extends SuperApiClass {
     return outletDefaultInventory;
   }
 
+  async __getOutletReturnedInventory({ outletId }) {
+    let inventoryList = await this.database.inventory.listByInventoryContainerId({ inventoryContainerId: outletId, inventoryContainerType: 'outlet' });
+    throwOnFalsy(inventoryList, "OUTLET_INVENTORY_INVALID", "Invalid Outlet Or Inventory could not be found");
+    let outletReturnedInventory = inventoryList.find(inventory => inventory.type === 'returned');
+    return outletReturnedInventory;
+  }
+
   async __getInventoryContainerDetails({ inventory }) {
     let inventoryContainer;
     if (inventory.inventoryContainerType === "outlet") {
diff --git a/server/src/collections/sales-return.js b/server/src/collections/sales-return.js
index f3ac47c66..6353233bb 100644
--- a/server/src/collections/sales-return.js
+++ b/server/src/collections/sales-return.js
@@ -18,6 +18,7 @@ exports.SalesReturnCollection = class extends Collection {
         })
       ),
       creditedAmount: Joi.number().max(999999999999999).required(),
+      returnableWasSavedInChangeWallet: Joi.boolean().required(),
 
       isDeleted: Joi.boolean().required()
     });
@@ -40,13 +41,14 @@ exports.SalesReturnCollection = class extends Collection {
   // NOTE: commented out, because currently we don't support deleting sales return.
   // get deletionIndicatorKey() { return 'isDeleted'; }
 
-  async create({ salesId, returnedProductList, creditedAmount }) {
+  async create({ salesId, returnedProductList, creditedAmount, shouldSaveReturnableInChangeWallet }) {
     return await this._insert({
       createdDatetimeStamp: (new Date).getTime(),
 
       salesId,
       returnedProductList,
       creditedAmount,
+      returnableWasSavedInChangeWallet: shouldSaveReturnableInChangeWallet,
 
       isDeleted: false
     });
diff --git a/server/src/index.js b/server/src/index.js
index 7d1be99ba..6c2a3c21a 100644
--- a/server/src/index.js
+++ b/server/src/index.js
@@ -80,6 +80,7 @@ const { GetSalesListApi } = require('./apis/get-sales-list');
 let { DiscardSalesApi } = require('./legacy-apis/discard-sales');
 
 let { AddSalesReturnApi } = require('./legacy-apis/add-sales-return');
+// const { AddSalesReturnApi } = require('./apis/add-sales-return');
 let { GetSalesReturnApi } = require('./legacy-apis/get-sales-return');
 let { GetSalesReturnListApi } = require('./legacy-apis/get-sales-return-list');
 
diff --git a/server/src/legacy-apis/add-sales-return.js b/server/src/legacy-apis/add-sales-return.js
index 43b484ed0..977c26c11 100644
--- a/server/src/legacy-apis/add-sales-return.js
+++ b/server/src/legacy-apis/add-sales-return.js
@@ -73,49 +73,22 @@ exports.AddSalesReturnApi = class extends salesCommonMixin(inventoryCommonMixin(
       })
   }
 
-  _calculatePayback({ returnedProductList }, cbfn) {
-    let promiseList = [];
-    let productIdList = returnedProductList.map(product => product.productId);
-    let payment = 0;
-
-    this.legacyDatabase.product.findByIdList({ idList: productIdList }, (err, productList) => {
-      productList.forEach(product => {
-        let promise = new Promise((accept, reject) => {
-          payment += product.salePrice;
-          accept();
-        });
-        promiseList.push(promise);
-      });
-
-      Promise.all(promiseList)
-        .then(_ => {
-          return cbfn(payment);
-        })
-        .catch(err => {
-          return this.fail(err);
-        })
-    });
-  }
-
-  _addSalesReturn({ salesId, returnedProductList, creditedAmount }, cbfn) {
-    this.legacyDatabase.salesReturn.create({ salesId, returnedProductList, creditedAmount }, (err, salesReturnId) => {
+  _addSalesReturn({ salesId, returnedProductList, creditedAmount, shouldSaveReturnableInChangeWallet }, cbfn) {
+    this.legacyDatabase.salesReturn.create({ salesId, returnedProductList, creditedAmount, shouldSaveReturnableInChangeWallet }, (err, salesReturnId) => {
       return cbfn(salesReturnId);
     })
   }
 
   handle({ body }) {
-    let { salesId, returnedProductList, creditedAmount } = body;
+    let { salesId, returnedProductList, creditedAmount, shouldSaveReturnableInChangeWallet } = body;
 
     this._getSales({ salesId }, (sales) => {
       this._verifyProductsExist({ productList: returnedProductList }, () => {
         this._verifyProductsAreReturnable({ productList: returnedProductList }, () => {
           this._getOutletReturnedInventory({ outletId: sales.outletId }, (outletReturnedInventory) => {
             this._returnProducts({ returnedProductList, outletReturnedInventory }, (outletReturnedInventory) => {
-              // this._getCustomer({ customerId: salesId.customerId }, (customer) => {
-              // this._calculatePayback({ returnedProductList }, (payment) => {
-              // this._handlePayback({ payment, customer }, () => {
-              this._addSalesReturn({ salesId, returnedProductList, creditedAmount }, (salesReturnId) => {
-                this.success({ status: "success", salesReturnId: salesReturnId });
+              this._addSalesReturn({ salesId, returnedProductList, creditedAmount, shouldSaveReturnableInChangeWallet }, (salesReturnId) => {
+                this.success({ status: "success", salesReturnId });
               });
             });
           });
diff --git a/server/src/legacy-collections/sales-return.js b/server/src/legacy-collections/sales-return.js
index fb1b6b7c9..49763c5b7 100644
--- a/server/src/legacy-collections/sales-return.js
+++ b/server/src/legacy-collections/sales-return.js
@@ -30,6 +30,7 @@ exports.SalesReturnCollection = class extends LegacyCollection {
         })
       ),
       creditedAmount: Joi.number().max(999999999999999).required(),
+      returnableWasSavedInChangeWallet: Joi.boolean().required(),
 
       isDeleted: Joi.boolean().required()
     });
@@ -50,13 +51,14 @@ exports.SalesReturnCollection = class extends LegacyCollection {
     ];
   }
 
-  create({ salesId, returnedProductList, creditedAmount }, cbfn) {
+  create({ salesId, returnedProductList, creditedAmount, shouldSaveReturnableInChangeWallet }, cbfn) {
     let doc = {
       createdDatetimeStamp: (new Date).getTime(),
 
       salesId,
       returnedProductList,
       creditedAmount,
+      returnableWasSavedInChangeWallet: shouldSaveReturnableInChangeWallet,
 
       isDeleted: false
     }
diff --git a/server/test/lib.js b/server/test/lib.js
index 9e05e96e6..5a76a7343 100644
--- a/server/test/lib.js
+++ b/server/test/lib.js
@@ -1090,6 +1090,7 @@ exports.validateSalesReturnSchema = (doc) => {
       })
     ),
     creditedAmount: Joi.number().max(999999999999999).required(),
+    returnableWasSavedInChangeWallet: Joi.boolean().required(),
 
     isDeleted: Joi.boolean().required()
   });
@@ -1111,6 +1112,7 @@ exports.validateSalesReturnSchemaWhenListObj = (doc) => {
       })
     ),
     creditedAmount: Joi.number().max(999999999999999).required(),
+    returnableWasSavedInChangeWallet: Joi.boolean().required(),
 
     isDeleted: Joi.boolean().required()
   });
diff --git a/server/test/test-sales-return-apis.js b/server/test/test-sales-return-apis.js
index 148d67903..fd3581bfe 100644
--- a/server/test/test-sales-return-apis.js
+++ b/server/test/test-sales-return-apis.js
@@ -87,7 +87,7 @@ let fromDate = new Date();
 fromDate.setDate(fromDate.getDate() - 1);
 fromDate = fromDate.getTime();
 
-describe('Sales Return', _ => {
+describe.only('Sales Return', _ => {
 
   it('START', testDoneFn => {
     initializeServer(_ => {
@@ -323,7 +323,7 @@ describe('Sales Return', _ => {
           }
         ],
         creditedAmount: 100, // TODO: use data from salesData.payment
-        shouldSaveReturnableInChangeWallet: false
+        shouldSaveReturnableInChangeWallet: true
       }
     }, (err, response, body) => {
       expect(response.statusCode).to.equal(200);

From 5786bd912cf881e3d44af93d68a79eb1bc2bfba7 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Sat, 6 Oct 2018 13:34:31 +0600
Subject: [PATCH 32/74] wip

---
 server/src/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/index.js b/server/src/index.js
index 6c2a3c21a..5b4f9bb5c 100644
--- a/server/src/index.js
+++ b/server/src/index.js
@@ -79,8 +79,8 @@ let { GetSalesApi } = require('./legacy-apis/get-sales');
 const { GetSalesListApi } = require('./apis/get-sales-list');
 let { DiscardSalesApi } = require('./legacy-apis/discard-sales');
 
-let { AddSalesReturnApi } = require('./legacy-apis/add-sales-return');
-// const { AddSalesReturnApi } = require('./apis/add-sales-return');
+// let { AddSalesReturnApi } = require('./legacy-apis/add-sales-return');
+const { AddSalesReturnApi } = require('./apis/add-sales-return');
 let { GetSalesReturnApi } = require('./legacy-apis/get-sales-return');
 let { GetSalesReturnListApi } = require('./legacy-apis/get-sales-return-list');
 

From 8ce041d3026b1c7ccc5518a461a39e66101d15de Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Sat, 6 Oct 2018 17:45:02 +0600
Subject: [PATCH 33/74] new support number

---
 client/src/lang-bn-bd.json | 2 +-
 client/src/lang-en-us.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/lang-bn-bd.json b/client/src/lang-bn-bd.json
index a71031d5b..3b1d3abfb 100644
--- a/client/src/lang-bn-bd.json
+++ b/client/src/lang-bn-bd.json
@@ -646,7 +646,7 @@
   },
   "payment": {
     "packageHasExpired": "আপনার প্যাকেজের মেয়াদ শেষ হয়ে গেছে।",
-    "pleaseCallUsToPurchaseSubscription": "আমাদের কে +880 1730 589311 নম্বর এ যোগাযোগ করুন প্যাকেজ চালু করতে।",
+    "pleaseCallUsToPurchaseSubscription": "আমাদের কে +880 1770 947908 নম্বর এ যোগাযোগ করুন প্যাকেজ চালু করতে।",
     "recheckVerificationStatus": "প্যাকেজ স্থিতি পুনরায় যাচাই করুন",
     "useDifferentOrganization": "ভিন্ন সংস্থা ব্যবহার করুন"
   },
diff --git a/client/src/lang-en-us.json b/client/src/lang-en-us.json
index 54d674864..cc3d4ce35 100644
--- a/client/src/lang-en-us.json
+++ b/client/src/lang-en-us.json
@@ -644,7 +644,7 @@
   },
   "payment": {
     "packageHasExpired": "Your package has expired.",
-    "pleaseCallUsToPurchaseSubscription": "Call us at +880 1730 589311 to purchase a subscription.",
+    "pleaseCallUsToPurchaseSubscription": "Call us at +880 1770 947908 to purchase a subscription.",
     "recheckVerificationStatus": "Recheck Verification Status",
     "useDifferentOrganization": "Use a different organization"
   },

From 51039b4a384872b520834bfbfd4d3a93212ecd25 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Sat, 6 Oct 2018 19:23:34 +0600
Subject: [PATCH 34/74] withdraw-from-change-wallet-balance md ready

---
 .../withdraw-from-change-wallet-balance.md    | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 meta/api-docs/withdraw-from-change-wallet-balance.md

diff --git a/meta/api-docs/withdraw-from-change-wallet-balance.md b/meta/api-docs/withdraw-from-change-wallet-balance.md
new file mode 100644
index 000000000..f31875767
--- /dev/null
+++ b/meta/api-docs/withdraw-from-change-wallet-balance.md
@@ -0,0 +1,47 @@
+This API handles attempt to Withdraw from change wallet balance.
+
+url: `api/withdraw-from-change-wallet-balance`
+
+method: `POST`
+
+# WARNING! API DISABLED!
+
+This API has been disabled.
+
+### request: 
+```js
+{
+  apiKey: Joi.string().length(64).required(),
+  customerId: Joi.number().max(999999999999999).required(),
+  amount: Joi.number().min(1).max(999999999999999).required()
+}
+```
+
+### response (on error):
+```js
+{
+  hasError: true,
+  error: {
+    code,
+    message
+  }
+}
+```
+
+Possible Error Codes:
+```js
+{ code: VALIDATION_ERROR } // validation error on one of the fields
+{ code: APIKEY_INVALID } // the api key is invalid
+{ code: CUSTOMER_INVALID } // customer does not exist
+```
+
+### response (on success):
+```js
+{
+  hasError: false,
+  status: "success"
+}
+```
+
+### db changes:
+updates the `customer` collection in db.
\ No newline at end of file

From 05a56be0889d34224677a773c471c8ad179387f1 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Sat, 6 Oct 2018 19:40:53 +0600
Subject: [PATCH 35/74] PRIV_MANAGE_CUSTOMER_DEBT is now
 PRIV_MANAGE_CUSTOMER_WALLET_BALANCE

---
 .../elem-common-employment-details-input.html |  2 +-
 .../elem-common-employment-details-input.html |  2 +-
 client/src/page-adjust-customer-balance.html  |  2 +-
 meta/api-docs/get-employee-list.md            |  2 +-
 meta/api-docs/get-employee.md                 |  2 +-
 meta/server-db-docs/employment.md             |  2 +-
 server/scripts/bulk.js                        |  2 +-
 .../withdraw-from-change-wallet-balance.js    | 41 +++++++++++++++++++
 server/src/collections/employment.js          |  4 +-
 server/src/fixtures/privilege-list.json       |  2 +-
 server/src/legacy-apis/add-new-employee.js    |  2 +-
 .../legacy-apis/adjust-customer-balance.js    |  2 +-
 server/src/legacy-apis/edit-employment.js     |  2 +-
 .../src/legacy-apis/hire-user-as-employee.js  |  2 +-
 server/src/legacy-collections/employment.js   |  6 +--
 server/test/lib.js                            |  2 +-
 server/test/test-employee-apis.js             | 16 ++++----
 server/test/test-sales-return-apis.js         |  2 +-
 18 files changed, 68 insertions(+), 27 deletions(-)
 create mode 100644 server/src/apis/withdraw-from-change-wallet-balance.js

diff --git a/admin-client/src/elem-common-employment-details-input.html b/admin-client/src/elem-common-employment-details-input.html
index 409614e73..4e2be22c4 100644
--- a/admin-client/src/elem-common-employment-details-input.html
+++ b/admin-client/src/elem-common-employment-details-input.html
@@ -93,7 +93,7 @@ <h3>Privileges:</h3>
             "PRIV_VIEW_CUSTOMER",
             "PRIV_ADD_CUSTOMER_DURING_SALES",
             "PRIV_MODIFY_CUSTOMER",
-            "PRIV_MANAGE_CUSTOMER_DEBT"
+            "PRIV_MANAGE_CUSTOMER_WALLET_BALANCE"
           ]
           if (shouldSetDefaultPrivileges) {
             for (let privilege of this.privilegeList) {
diff --git a/client/src/elem-common-employment-details-input.html b/client/src/elem-common-employment-details-input.html
index 8e0404fb7..e9bf05f7b 100644
--- a/client/src/elem-common-employment-details-input.html
+++ b/client/src/elem-common-employment-details-input.html
@@ -106,7 +106,7 @@ <h3>[[verses.commonEmploymentDetails.privileges]]:</h3>
             "PRIV_VIEW_CUSTOMER",
             "PRIV_ADD_CUSTOMER_DURING_SALES",
             "PRIV_MODIFY_CUSTOMER",
-            "PRIV_MANAGE_CUSTOMER_DEBT"
+            "PRIV_MANAGE_CUSTOMER_WALLET_BALANCE"
           ]
           if (shouldSetDefaultPrivileges) {
             for (let privilege of this.privilegeList) {
diff --git a/client/src/page-adjust-customer-balance.html b/client/src/page-adjust-customer-balance.html
index 30f4b9c1f..b62724e2b 100644
--- a/client/src/page-adjust-customer-balance.html
+++ b/client/src/page-adjust-customer-balance.html
@@ -118,7 +118,7 @@
       }
 
       _ensureAccess() {
-        return this.accessControl('privileged', ['PRIV_MANAGE_CUSTOMER_DEBT']);
+        return this.accessControl('privileged', ['PRIV_MANAGE_CUSTOMER_WALLET_BALANCE']);
       }
 
       // region: editCustomer =================================
diff --git a/meta/api-docs/get-employee-list.md b/meta/api-docs/get-employee-list.md
index d23b1f40d..7c36f4b7b 100644
--- a/meta/api-docs/get-employee-list.md
+++ b/meta/api-docs/get-employee-list.md
@@ -88,7 +88,7 @@ Possible Error Codes:
         PRIV_VIEW_CUSTOMER: Joi.boolean().required(),
         PRIV_ADD_CUSTOMER_DURING_SALES: Joi.boolean().required(),
         PRIV_MODIFY_CUSTOMER: Joi.boolean().required(),
-        PRIV_MANAGE_CUSTOMER_DEBT: Joi.boolean().required()
+        PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: Joi.boolean().required()
       }),
       isActive: Joi.boolean().required()
     });
diff --git a/meta/api-docs/get-employee.md b/meta/api-docs/get-employee.md
index e25eb7437..4159248d0 100644
--- a/meta/api-docs/get-employee.md
+++ b/meta/api-docs/get-employee.md
@@ -88,7 +88,7 @@ Possible Error Codes:
       PRIV_VIEW_CUSTOMER: Joi.boolean().required(),
       PRIV_ADD_CUSTOMER_DURING_SALES: Joi.boolean().required(),
       PRIV_MODIFY_CUSTOMER: Joi.boolean().required(),
-      PRIV_MANAGE_CUSTOMER_DEBT: Joi.boolean().required()
+      PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: Joi.boolean().required()
     }),
     isActive: Joi.boolean().required()
   });
diff --git a/meta/server-db-docs/employment.md b/meta/server-db-docs/employment.md
index 37a58cad2..6504030ee 100644
--- a/meta/server-db-docs/employment.md
+++ b/meta/server-db-docs/employment.md
@@ -46,7 +46,7 @@ Joi.object().keys({
     PRIV_VIEW_CUSTOMER: Joi.boolean().required(),
     PRIV_ADD_CUSTOMER_DURING_SALES: Joi.boolean().required(),
     PRIV_MODIFY_CUSTOMER: Joi.boolean().required(),
-    PRIV_MANAGE_CUSTOMER_DEBT: Joi.boolean().required()
+    PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: Joi.boolean().required()
   }),
   isActive: Joi.boolean().required()
 });
diff --git a/server/scripts/bulk.js b/server/scripts/bulk.js
index 9aad79447..2d9e6bbb6 100644
--- a/server/scripts/bulk.js
+++ b/server/scripts/bulk.js
@@ -231,7 +231,7 @@ const createEmployee = async ({ apiKey, organizationId }) => {
       PRIV_VIEW_CUSTOMER: true,
       PRIV_ADD_CUSTOMER_DURING_SALES: true,
       PRIV_MODIFY_CUSTOMER: true,
-      PRIV_MANAGE_CUSTOMER_DEBT: true
+      PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: true
     }
   });
 
diff --git a/server/src/apis/withdraw-from-change-wallet-balance.js b/server/src/apis/withdraw-from-change-wallet-balance.js
new file mode 100644
index 000000000..c40a2ac43
--- /dev/null
+++ b/server/src/apis/withdraw-from-change-wallet-balance.js
@@ -0,0 +1,41 @@
+const { Api } = require('./../api-base');
+const Joi = require('joi');
+const { throwOnFalsy, throwOnTruthy, CodedError } = require('./../utils/coded-error');
+const { extract } = require('./../utils/extract');
+
+exports.WithdrawFromChangeWalletBalanceApi = class extends Api {
+
+  get autoValidates() { return true; }
+
+  get requiresAuthentication() { return true; }
+
+  get requestSchema() {
+    return Joi.object().keys({
+
+      customerId: Joi.number().max(999999999999999).required(),
+      amount: Joi.number().min(1).max(999999999999999).required()
+
+    });
+  }
+
+  get accessControl() {
+    return [{
+      organizationBy: {
+        from: "customer",
+        query: ({ customerId }) => ({ id: customerId }),
+        select: "organizationId",
+        errorCode: "CUSTOMER_INVALID"
+      },
+      privileges: [
+        "PRIV_MANAGE_CUSTOMER_WALLET_BALANCE"
+      ]
+    }];
+  }
+
+  async handle({ body, userId }) {
+    let { customerId, amount } = body;
+
+    return { status: "success" };
+  }
+
+}
\ No newline at end of file
diff --git a/server/src/collections/employment.js b/server/src/collections/employment.js
index 0702cde73..9b8406e6a 100644
--- a/server/src/collections/employment.js
+++ b/server/src/collections/employment.js
@@ -49,7 +49,7 @@ exports.EmploymentCollection = class extends Collection {
         PRIV_VIEW_CUSTOMER: Joi.boolean().required(),
         PRIV_ADD_CUSTOMER_DURING_SALES: Joi.boolean().required(),
         PRIV_MODIFY_CUSTOMER: Joi.boolean().required(),
-        PRIV_MANAGE_CUSTOMER_DEBT: Joi.boolean().required()
+        PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: Joi.boolean().required()
       }),
       isActive: Joi.boolean().required()
     });
@@ -109,7 +109,7 @@ exports.EmploymentCollection = class extends Collection {
       "PRIV_VIEW_CUSTOMER",
       "PRIV_ADD_CUSTOMER_DURING_SALES",
       "PRIV_MODIFY_CUSTOMER",
-      "PRIV_MANAGE_CUSTOMER_DEBT"
+      "PRIV_MANAGE_CUSTOMER_WALLET_BALANCE"
     ];
   }
 
diff --git a/server/src/fixtures/privilege-list.json b/server/src/fixtures/privilege-list.json
index 4cd9176ac..59a4f3472 100644
--- a/server/src/fixtures/privilege-list.json
+++ b/server/src/fixtures/privilege-list.json
@@ -104,7 +104,7 @@
     "name": "Modify customer"
   },
   {
-    "code": "PRIV_MANAGE_CUSTOMER_DEBT",
+    "code": "PRIV_MANAGE_CUSTOMER_WALLET_BALANCE",
     "name": "Manage customer debt"
   }
 ]
\ No newline at end of file
diff --git a/server/src/legacy-apis/add-new-employee.js b/server/src/legacy-apis/add-new-employee.js
index c5ca5e20b..3e23184b9 100644
--- a/server/src/legacy-apis/add-new-employee.js
+++ b/server/src/legacy-apis/add-new-employee.js
@@ -58,7 +58,7 @@ exports.AddNewEmployeeApi = class extends phoneVerificationRequestMixin(userComm
         PRIV_VIEW_CUSTOMER: Joi.boolean().required(),
         PRIV_ADD_CUSTOMER_DURING_SALES: Joi.boolean().required(),
         PRIV_MODIFY_CUSTOMER: Joi.boolean().required(),
-        PRIV_MANAGE_CUSTOMER_DEBT: Joi.boolean().required()
+        PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: Joi.boolean().required()
       })
     });
   }
diff --git a/server/src/legacy-apis/adjust-customer-balance.js b/server/src/legacy-apis/adjust-customer-balance.js
index 1a3bf2b4d..bbd556810 100644
--- a/server/src/legacy-apis/adjust-customer-balance.js
+++ b/server/src/legacy-apis/adjust-customer-balance.js
@@ -32,7 +32,7 @@ exports.AdjustCustomerBalanceApi = class extends collectionCommonMixin(customerC
         errorCode: "CUSTOMER_INVALID"
       },
       privileges: [
-        "PRIV_MANAGE_CUSTOMER_DEBT"
+        "PRIV_MANAGE_CUSTOMER_WALLET_BALANCE"
       ]
     }];
   }
diff --git a/server/src/legacy-apis/edit-employment.js b/server/src/legacy-apis/edit-employment.js
index 7fa6db46e..1f3cfe597 100644
--- a/server/src/legacy-apis/edit-employment.js
+++ b/server/src/legacy-apis/edit-employment.js
@@ -55,7 +55,7 @@ exports.EditEmploymentApi = class extends userCommonMixin(collectionCommonMixin(
         PRIV_VIEW_CUSTOMER: Joi.boolean().required(),
         PRIV_ADD_CUSTOMER_DURING_SALES: Joi.boolean().required(),
         PRIV_MODIFY_CUSTOMER: Joi.boolean().required(),
-        PRIV_MANAGE_CUSTOMER_DEBT: Joi.boolean().required()
+        PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: Joi.boolean().required()
       })
     });
   }
diff --git a/server/src/legacy-apis/hire-user-as-employee.js b/server/src/legacy-apis/hire-user-as-employee.js
index 589134a64..a8ff7f489 100644
--- a/server/src/legacy-apis/hire-user-as-employee.js
+++ b/server/src/legacy-apis/hire-user-as-employee.js
@@ -55,7 +55,7 @@ exports.HireUserAsEmployeeApi = class extends userCommonMixin(collectionCommonMi
         PRIV_VIEW_CUSTOMER: Joi.boolean().required(),
         PRIV_ADD_CUSTOMER_DURING_SALES: Joi.boolean().required(),
         PRIV_MODIFY_CUSTOMER: Joi.boolean().required(),
-        PRIV_MANAGE_CUSTOMER_DEBT: Joi.boolean().required()
+        PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: Joi.boolean().required()
       })
     });
   }
diff --git a/server/src/legacy-collections/employment.js b/server/src/legacy-collections/employment.js
index 4f56dafa3..c217c80df 100644
--- a/server/src/legacy-collections/employment.js
+++ b/server/src/legacy-collections/employment.js
@@ -62,7 +62,7 @@ exports.EmploymentCollection = class extends LegacyCollection {
         PRIV_VIEW_CUSTOMER: Joi.boolean().required(),
         PRIV_ADD_CUSTOMER_DURING_SALES: Joi.boolean().required(),
         PRIV_MODIFY_CUSTOMER: Joi.boolean().required(),
-        PRIV_MANAGE_CUSTOMER_DEBT: Joi.boolean().required()
+        PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: Joi.boolean().required()
       }),
       isActive: Joi.boolean().required(),
     });
@@ -123,7 +123,7 @@ exports.EmploymentCollection = class extends LegacyCollection {
       "PRIV_VIEW_CUSTOMER",
       "PRIV_ADD_CUSTOMER_DURING_SALES",
       "PRIV_MODIFY_CUSTOMER",
-      "PRIV_MANAGE_CUSTOMER_DEBT"
+      "PRIV_MANAGE_CUSTOMER_WALLET_BALANCE"
     ];
 
     let employeeDefaultPrivilegeList = [
@@ -160,7 +160,7 @@ exports.EmploymentCollection = class extends LegacyCollection {
       "PRIV_VIEW_CUSTOMER",
       "PRIV_ADD_CUSTOMER_DURING_SALES",
       "PRIV_MODIFY_CUSTOMER",
-      "PRIV_MANAGE_CUSTOMER_DEBT"
+      "PRIV_MANAGE_CUSTOMER_WALLET_BALANCE"
     ];
 
     let privileges = {};
diff --git a/server/test/lib.js b/server/test/lib.js
index 5a76a7343..8c776393f 100644
--- a/server/test/lib.js
+++ b/server/test/lib.js
@@ -1238,7 +1238,7 @@ exports.validateEmploymentSchema = (doc) => {
       PRIV_VIEW_CUSTOMER: Joi.boolean().required(),
       PRIV_ADD_CUSTOMER_DURING_SALES: Joi.boolean().required(),
       PRIV_MODIFY_CUSTOMER: Joi.boolean().required(),
-      PRIV_MANAGE_CUSTOMER_DEBT: Joi.boolean().required()
+      PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: Joi.boolean().required()
     }),
 
     isActive: Joi.boolean().required()
diff --git a/server/test/test-employee-apis.js b/server/test/test-employee-apis.js
index 5bcf9092e..111b99ba1 100644
--- a/server/test/test-employee-apis.js
+++ b/server/test/test-employee-apis.js
@@ -165,7 +165,7 @@ describe('Employee', _ => {
           PRIV_VIEW_CUSTOMER: true,
           PRIV_ADD_CUSTOMER_DURING_SALES: true,
           PRIV_MODIFY_CUSTOMER: true,
-          PRIV_MANAGE_CUSTOMER_DEBT: true
+          PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: true
         }
       }
     }, (err, response, body) => {
@@ -221,7 +221,7 @@ describe('Employee', _ => {
           PRIV_VIEW_CUSTOMER: true,
           PRIV_ADD_CUSTOMER_DURING_SALES: true,
           PRIV_MODIFY_CUSTOMER: true,
-          PRIV_MANAGE_CUSTOMER_DEBT: true
+          PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: true
         }
       }
     }, (err, response, body) => {
@@ -276,7 +276,7 @@ describe('Employee', _ => {
           PRIV_VIEW_CUSTOMER: true,
           PRIV_ADD_CUSTOMER_DURING_SALES: true,
           PRIV_MODIFY_CUSTOMER: true,
-          PRIV_MANAGE_CUSTOMER_DEBT: true
+          PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: true
         }
       }
     }, (err, response, body) => {
@@ -332,7 +332,7 @@ describe('Employee', _ => {
           PRIV_VIEW_CUSTOMER: true,
           PRIV_ADD_CUSTOMER_DURING_SALES: true,
           PRIV_MODIFY_CUSTOMER: true,
-          PRIV_MANAGE_CUSTOMER_DEBT: true
+          PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: true
         }
       }
     }, (err, response, body) => {
@@ -498,7 +498,7 @@ describe('Employee', _ => {
           PRIV_VIEW_CUSTOMER: true,
           PRIV_ADD_CUSTOMER_DURING_SALES: true,
           PRIV_MODIFY_CUSTOMER: true,
-          PRIV_MANAGE_CUSTOMER_DEBT: true
+          PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: true
         }
       }
     }, (err, response, body) => {
@@ -559,7 +559,7 @@ describe('Employee', _ => {
           PRIV_VIEW_CUSTOMER: true,
           PRIV_ADD_CUSTOMER_DURING_SALES: true,
           PRIV_MODIFY_CUSTOMER: true,
-          PRIV_MANAGE_CUSTOMER_DEBT: true
+          PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: true
         }
       }
     }, (err, response, body) => {
@@ -620,7 +620,7 @@ describe('Employee', _ => {
           PRIV_VIEW_CUSTOMER: true,
           PRIV_ADD_CUSTOMER_DURING_SALES: true,
           PRIV_MODIFY_CUSTOMER: true,
-          PRIV_MANAGE_CUSTOMER_DEBT: true
+          PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: true
         }
       }
     }, (err, response, body) => {
@@ -858,7 +858,7 @@ describe('Employee', _ => {
           PRIV_VIEW_CUSTOMER: true,
           PRIV_ADD_CUSTOMER_DURING_SALES: true,
           PRIV_MODIFY_CUSTOMER: true,
-          PRIV_MANAGE_CUSTOMER_DEBT: true
+          PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: true
         }
       }
     }, (err, response, body) => {
diff --git a/server/test/test-sales-return-apis.js b/server/test/test-sales-return-apis.js
index fd3581bfe..241fc859f 100644
--- a/server/test/test-sales-return-apis.js
+++ b/server/test/test-sales-return-apis.js
@@ -87,7 +87,7 @@ let fromDate = new Date();
 fromDate.setDate(fromDate.getDate() - 1);
 fromDate = fromDate.getTime();
 
-describe.only('Sales Return', _ => {
+describe('Sales Return', _ => {
 
   it('START', testDoneFn => {
     initializeServer(_ => {

From 8af4a4b3885b42d8233c55a4cab109245826a8c9 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Sat, 6 Oct 2018 19:44:57 +0600
Subject: [PATCH 36/74] WithdrawFromChangeWalletBalanceApi index

---
 server/src/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/index.js b/server/src/index.js
index 5b4f9bb5c..3e8315355 100644
--- a/server/src/index.js
+++ b/server/src/index.js
@@ -47,7 +47,7 @@ let { AddCustomerApi } = require('./legacy-apis/add-customer');
 let { GetCustomerApi } = require('./legacy-apis/get-customer');
 const { GetCustomerSummaryListApi } = require('./apis/get-customer-summary-list');
 let { EditCustomerApi } = require('./legacy-apis/edit-customer');
-let { AdjustCustomerBalanceApi } = require('./legacy-apis/adjust-customer-balance');
+const { WithdrawFromChangeWalletBalanceApi } = require('./apis/withdraw-from-change-wallet-balance');
 let { DeleteCustomerApi } = require('./legacy-apis/delete-customer');
 
 let { AddOutletApi } = require('./legacy-apis/add-outlet');
@@ -266,7 +266,7 @@ class Program {
     server.registerPostApi('/api/get-customer', GetCustomerApi);
     server.registerPostApi('/api/get-customer-summary-list', GetCustomerSummaryListApi);
     server.registerPostApi('/api/edit-customer', EditCustomerApi);
-    server.registerPostApi('/api/adjust-customer-balance', AdjustCustomerBalanceApi);
+    server.registerPostApi('/api/withdraw-from-change-wallet-balance', WithdrawFromChangeWalletBalanceApi);
     server.registerPostApi('/api/delete-customer', DeleteCustomerApi);
     server.registerPostApi('/api/add-outlet', AddOutletApi);
     server.registerPostApi('/api/get-outlet-list', GetOutletListApi);

From 037ce9a36e863aeac06134a288dc9ff389bac716 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Sat, 6 Oct 2018 19:55:22 +0600
Subject: [PATCH 37/74] withdraw-from-change-wallet-balance wip

---
 .../withdraw-from-change-wallet-balance.js    |  3 +
 server/test/test-sales-apis.js                | 57 ++++++++++++++++++-
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/server/src/apis/withdraw-from-change-wallet-balance.js b/server/src/apis/withdraw-from-change-wallet-balance.js
index c40a2ac43..eaf227ec1 100644
--- a/server/src/apis/withdraw-from-change-wallet-balance.js
+++ b/server/src/apis/withdraw-from-change-wallet-balance.js
@@ -35,6 +35,9 @@ exports.WithdrawFromChangeWalletBalanceApi = class extends Api {
   async handle({ body, userId }) {
     let { customerId, amount } = body;
 
+    let customer = await this.database.customer.findById({ id: customerId });
+    console.log("customer: ", customer);
+
     return { status: "success" };
   }
 
diff --git a/server/test/test-sales-apis.js b/server/test/test-sales-apis.js
index 7b65aa578..a58dd6217 100644
--- a/server/test/test-sales-apis.js
+++ b/server/test/test-sales-apis.js
@@ -82,7 +82,7 @@ let fromDate = new Date();
 fromDate.setDate(fromDate.getDate() - 1);
 fromDate = fromDate.getTime();
 
-describe('Sales', _ => {
+describe.only('Sales', _ => {
 
   it('START', testDoneFn => {
     initializeServer(_ => {
@@ -452,7 +452,7 @@ describe('Sales', _ => {
           discountedAmount: ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)),
           serviceChargeAmount: 0,
           totalBilled: (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100))),
-          paidAmount: 300,
+          paidAmount: 1300,
           changeAmount: (300 - (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100)))),
           shouldSaveChangeInAccount: true,
           paymentMethod: 'cash'
@@ -815,6 +815,59 @@ describe('Sales', _ => {
 
   });
 
+  // Customer test
+
+  it('api/withdraw-from-change-wallet-balance (Invalid customerId)', testDoneFn => {
+
+    callApi('api/withdraw-from-change-wallet-balance', {
+      json: {
+        apiKey,
+        customerId: invalidCustomerId,
+        amount: 50
+      }
+    }, (err, response, body) => {
+      expect(response.statusCode).to.equal(200);
+      validateGenericApiFailureResponse(body);
+      expect(body.error.code).equal('CUSTOMER_INVALID');
+      testDoneFn();
+    });
+
+  });
+
+  it('api/withdraw-from-change-wallet-balance (Invalid amount)', testDoneFn => {
+
+    callApi('api/withdraw-from-change-wallet-balance', {
+      json: {
+        apiKey,
+        customerId,
+        amount: -50
+      }
+    }, (err, response, body) => {
+      expect(response.statusCode).to.equal(200);
+      validateGenericApiFailureResponse(body);
+      expect(body.error.code).equal('VALIDATION_ERROR');
+      testDoneFn();
+    });
+
+  });
+
+  it('api/withdraw-from-change-wallet-balance (Valid)', testDoneFn => {
+
+    callApi('api/withdraw-from-change-wallet-balance', {
+      json: {
+        apiKey,
+        customerId,
+        amount: 50
+      }
+    }, (err, response, body) => {
+      console.log(body);
+      expect(response.statusCode).to.equal(200);
+      validateGenericApiSuccessResponse(body);
+      testDoneFn();
+    });
+
+  });
+
   it('END', testDoneFn => {
     terminateServer(testDoneFn);
   });

From 67664c9f7a5b33326c7e7aad0b29cece2a8c6dab Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Sat, 6 Oct 2018 20:27:43 +0600
Subject: [PATCH 38/74] WithdrawFromChangeWalletBalanceApi done

---
 .../withdraw-from-change-wallet-balance.md    |  1 +
 .../withdraw-from-change-wallet-balance.js    |  5 +-
 server/test/test-sales-apis.js                | 48 +++++++++++++++++--
 3 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/meta/api-docs/withdraw-from-change-wallet-balance.md b/meta/api-docs/withdraw-from-change-wallet-balance.md
index f31875767..f1998b24b 100644
--- a/meta/api-docs/withdraw-from-change-wallet-balance.md
+++ b/meta/api-docs/withdraw-from-change-wallet-balance.md
@@ -33,6 +33,7 @@ Possible Error Codes:
 { code: VALIDATION_ERROR } // validation error on one of the fields
 { code: APIKEY_INVALID } // the api key is invalid
 { code: CUSTOMER_INVALID } // customer does not exist
+{ code: INSUFFICIENT_BALANCE } // Customer does not have enough balance to pay this amount
 ```
 
 ### response (on success):
diff --git a/server/src/apis/withdraw-from-change-wallet-balance.js b/server/src/apis/withdraw-from-change-wallet-balance.js
index eaf227ec1..5bf84e89f 100644
--- a/server/src/apis/withdraw-from-change-wallet-balance.js
+++ b/server/src/apis/withdraw-from-change-wallet-balance.js
@@ -2,8 +2,9 @@ const { Api } = require('./../api-base');
 const Joi = require('joi');
 const { throwOnFalsy, throwOnTruthy, CodedError } = require('./../utils/coded-error');
 const { extract } = require('./../utils/extract');
+const { CustomerMixin } = require('./mixins/customer-mixin');
 
-exports.WithdrawFromChangeWalletBalanceApi = class extends Api {
+exports.WithdrawFromChangeWalletBalanceApi = class extends Api.mixin(CustomerMixin) {
 
   get autoValidates() { return true; }
 
@@ -36,7 +37,7 @@ exports.WithdrawFromChangeWalletBalanceApi = class extends Api {
     let { customerId, amount } = body;
 
     let customer = await this.database.customer.findById({ id: customerId });
-    console.log("customer: ", customer);
+    await this._deductFromChangeWalletAsPayment({ customer, amount });
 
     return { status: "success" };
   }
diff --git a/server/test/test-sales-apis.js b/server/test/test-sales-apis.js
index a58dd6217..1e38c5be4 100644
--- a/server/test/test-sales-apis.js
+++ b/server/test/test-sales-apis.js
@@ -26,7 +26,10 @@ let {
   validateGetSalesListApiSuccessResponse,
   validateAddSalesReturnApiSuccessResponse,
   validateSalesSchema,
-  validateSalesSchemaWhenListObj
+  validateSalesSchemaWhenListObj,
+
+  validateGetCustomerApiSuccessResponse,
+  validateCustomerSchema
 } = require('./lib');
 
 const prefix = 's';
@@ -815,7 +818,7 @@ describe.only('Sales', _ => {
 
   });
 
-  // Customer test
+  // WithdrawFromChangeWalletBalanceApi tests - start
 
   it('api/withdraw-from-change-wallet-balance (Invalid customerId)', testDoneFn => {
 
@@ -851,16 +854,32 @@ describe.only('Sales', _ => {
 
   });
 
+  it('api/withdraw-from-change-wallet-balance (Invalid amount)', testDoneFn => {
+
+    callApi('api/withdraw-from-change-wallet-balance', {
+      json: {
+        apiKey,
+        customerId,
+        amount: 3000
+      }
+    }, (err, response, body) => {
+      expect(response.statusCode).to.equal(200);
+      validateGenericApiFailureResponse(body);
+      expect(body.error.code).equal('INSUFFICIENT_BALANCE');
+      testDoneFn();
+    });
+
+  });
+
   it('api/withdraw-from-change-wallet-balance (Valid)', testDoneFn => {
 
     callApi('api/withdraw-from-change-wallet-balance', {
       json: {
         apiKey,
         customerId,
-        amount: 50
+        amount: 50.9
       }
     }, (err, response, body) => {
-      console.log(body);
       expect(response.statusCode).to.equal(200);
       validateGenericApiSuccessResponse(body);
       testDoneFn();
@@ -868,6 +887,27 @@ describe.only('Sales', _ => {
 
   });
 
+  it('api/get-customer (changeWalletBalance check)', testDoneFn => {
+
+    callApi('api/get-customer', {
+      json: {
+        apiKey,
+        customerId
+      }
+    }, (err, response, body) => {
+      expect(response.statusCode).to.equal(200);
+      validateGetCustomerApiSuccessResponse(body);
+      validateCustomerSchema(body.customer);
+
+      expect(body.customer).to.have.property('withdrawalHistory').to.have.lengthOf(0);
+
+      testDoneFn();
+    })
+
+  });
+
+  // WithdrawFromChangeWalletBalanceApi tests - end
+
   it('END', testDoneFn => {
     terminateServer(testDoneFn);
   });

From 8e6f0f329169b6b68ff9bf52cb6c0c992c228bc5 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Sat, 6 Oct 2018 20:56:20 +0600
Subject: [PATCH 39/74] page wired

---
 client/src/lang-bn-bd.json                    |   4 +-
 client/src/lang-en-us.json                    |   4 +-
 client/src/page-pos.html                      |   2 +-
 client/src/page-view-customer.html            |  27 ++-
 ...e-withdraw-from-change-wallet-balance.html | 168 ++++++++++++++++++
 client/src/torque-app.html                    |   4 +-
 server/test/test-sales-apis.js                |   2 +-
 7 files changed, 196 insertions(+), 15 deletions(-)
 create mode 100644 client/src/page-withdraw-from-change-wallet-balance.html

diff --git a/client/src/lang-bn-bd.json b/client/src/lang-bn-bd.json
index 3b1d3abfb..eb4ec045e 100644
--- a/client/src/lang-bn-bd.json
+++ b/client/src/lang-bn-bd.json
@@ -72,7 +72,8 @@
     "designation": "পদবী",
     "errorMessageBody": "ত্রুটি ত্রুটি দেখা দিয়েছে, লিপি প্রতিনিধির সাথে যোগাযোগ করুন",
     "errorMessageTitle": "ত্রুটি",
-    "noDataFound": "কোন তথ্য পাওয়া যায়নি"
+    "noDataFound": "কোন তথ্য পাওয়া যায়নি",
+    "changeWallet": "Change Wallet"
   },
   "login": {
     "forgotPassword": "পাসওয়ার্ড ভুলে গেছেন?",
@@ -355,6 +356,7 @@
   },
   "customer": {
     "editCustomerTitle": "গ্রাহক সম্পাদনা করুন",
+    "withdrawFromChangeWalletBalance": "Withdraw from change wallet balance",
     "addCustomerTitle": "গ্রাহক যুক্ত করুন",
     "customerNameInput": "গ্রাহকের নাম",
     "customerNameInputError": "একটি সঠিক নাম লিখুন",
diff --git a/client/src/lang-en-us.json b/client/src/lang-en-us.json
index cc3d4ce35..3f4c8c7c8 100644
--- a/client/src/lang-en-us.json
+++ b/client/src/lang-en-us.json
@@ -72,7 +72,8 @@
     "designation": "Designation",
     "errorMessageBody": "Error Occurred, Please contact Lipi representative.",
     "errorMessageTitle": "Error",
-    "noDataFound": "No Data Found"
+    "noDataFound": "No Data Found",
+    "changeWallet": "Change Wallet"
   },
   "login": {
     "forgotPassword": "Forgot your Password?",
@@ -353,6 +354,7 @@
   },
   "customer": {
     "editCustomerTitle": "Edit Customer",
+    "withdrawFromChangeWalletBalance": "Withdraw from change wallet balance",
     "addCustomerTitle": "Add Customer",
     "customerNameInput": "Name of your customer.",
     "customerNameInputError": "Enter a valid name",
diff --git a/client/src/page-pos.html b/client/src/page-pos.html
index 612da6c1a..14e9ab65b 100644
--- a/client/src/page-pos.html
+++ b/client/src/page-pos.html
@@ -223,7 +223,7 @@
                   <paper-item name="card">[[verses.general.card]]</paper-item>
                   <paper-item name="digital">[[verses.general.digital]]</paper-item>
                   <template is="dom-if" if="[[customer]]">
-                    <paper-item name="change-wallet">change wallet</paper-item>
+                    <paper-item name="change-wallet">[[verses.general.changeWallet]]</paper-item>
                   </template>
                 </paper-listbox>
               </paper-dropdown-menu>
diff --git a/client/src/page-view-customer.html b/client/src/page-view-customer.html
index 8dbe1adda..a47bd6968 100644
--- a/client/src/page-view-customer.html
+++ b/client/src/page-view-customer.html
@@ -41,17 +41,22 @@
         <div>[[verses.general.number]]: [[customer.phone]]</div>
       </div>
 
-      <template is="dom-if" if="[[customer.withdrawalHistory.length]]">
+      <template is="dom-if" if="[[customer.changeWalletBalance]]">
+        
         <div class="card vertical layout">
 
-          [[verses.customer.withdrawalHistory]]:
-          <template is="dom-repeat" items="[[customer.withdrawalHistory]]" as="withdrawal">
-            <div>
-              <b>#[[index]]</b> [[verses.general.date]]: [[$mkDate(withdrawal.creditedDatetimeStamp, 'hh:mmtt dd-MM-yyyy')]]
-            </div>
-            <div>
-              [[verses.general.amount]]: [[$round(withdrawal.amount)]] [[app.settings.monetaryUnit]]
-            </div>
+          <paper-button raised class="secondary" on-tap="withdrawFromChangeWalletBalanceTapped">[[verses.customer.withdrawFromChangeWalletBalance]]</paper-button>
+
+          <template is="dom-if" if="[[customer.withdrawalHistory.length]]">
+            [[verses.customer.withdrawalHistory]]:
+            <template is="dom-repeat" items="[[customer.withdrawalHistory]]" as="withdrawal">
+              <div>
+                <b>#[[index]]</b> [[verses.general.date]]: [[$mkDate(withdrawal.creditedDatetimeStamp, 'hh:mmtt dd-MM-yyyy')]]
+              </div>
+              <div>
+                [[verses.general.amount]]: [[$round(withdrawal.amount)]] [[app.settings.monetaryUnit]]
+              </div>
+            </template>
           </template>
 
         </div>
@@ -157,6 +162,10 @@
         return this.app.navigateTo(`/adjust-customer-balance/customer:${this.customer.id}`);
       }
 
+      withdrawFromChangeWalletBalanceTapped(e = null) {
+        return this.app.navigateTo(`/withdraw-from-change-wallet-balance/customer:${this.customer.id}`);
+      }
+
       deleteTapped(e = null) {
         let message = this.app.verses.customer.deleteCustomerQuestionPartOne + this.customer.name + "." + this.app.verses.customer.deleteCustomerQuestionPartTwo;
         this.app.showModalConfirmation(this.app.verses.customer.deleteCustomerQuestion, message, (answer) => {
diff --git a/client/src/page-withdraw-from-change-wallet-balance.html b/client/src/page-withdraw-from-change-wallet-balance.html
new file mode 100644
index 000000000..1f2de0832
--- /dev/null
+++ b/client/src/page-withdraw-from-change-wallet-balance.html
@@ -0,0 +1,168 @@
+<link rel="import" href="../bower_components/polymer/polymer-element.html">
+<link rel="import" href="../bower_components/paper-button/paper-button.html">
+<link rel="import" href="../bower_components/paper-input/paper-input.html">
+<link rel="import" href="../bower_components/paper-input/paper-textarea.html">
+<link rel="import" href="../bower_components/paper-tabs/paper-tabs.html">
+<link rel="import" href="../bower_components/paper-tabs/paper-tab.html">
+<link rel="import" href="../bower_components/paper-checkbox/paper-checkbox.html">
+<link rel="import" href="../bower_components/iron-form/iron-form.html">
+
+<link rel="import" href="../bower_components/paper-dropdown-menu/paper-dropdown-menu.html">
+<link rel="import" href="../bower_components/paper-listbox/paper-listbox.html">
+<link rel="import" href="../bower_components/paper-item/paper-item.html">
+
+<link rel="import" href="../bower_components/baselib/baselib.html">
+
+<link rel="import" href="../bower_components/polymer-fx/fx-page.html">
+<link rel="import" href="../bower_components/polymer-fx/fx-common-behavior.html">
+
+<link rel="import" href="torque-db-behavior.html">
+<link rel="import" href="torque-common-behavior.html">
+<link rel="import" href="torque-page-behavior.html">
+<link rel="import" href="torque-language-behavior.html">
+
+<link rel="import" href="shared-styles.html">
+
+
+<dom-module id="page-withdraw-from-change-wallet-balance">
+  <template>
+    <style include="shared-styles">
+
+    </style>
+
+    <elem-not-ready is-ready="[[isReady]]"></elem-not-ready>
+
+    <div class$="page layout vertical [[$if(isReady, '', 'hidden')]]" id="wrapper">
+      <iron-form id="adjustCustomerBalanceForm">
+        <form>
+          <div class="card vertical layout">
+
+            <paper-input class="adjustCustomerBalanceForm--amount" value="{{adjustCustomerBalanceForm.amount}}" type="number" required minlength="1" maxlength="10" error-message=[[verses.adjustCustomerBalance.amountInputError]] label=[[verses.adjustCustomerBalance.amountInput]]></paper-input>
+            <div class="horizontal layout button-row end">
+              <div class="flex"></div>
+              <paper-button raised class="primary" on-tap="adjustCustomerBalanceTapped">[[verses.adjustCustomerBalance.adjust]]</paper-button>
+            </div>
+
+          </div>
+        </form>
+      </iron-form>
+    </div>
+
+  </template>
+
+  <script>
+    class PageWithdrawFromChangeWalletBalance extends FxPage.mixin(TorqueCommonBehavior, TorquePageBehavior, TorqueDbBehavior, FxCommonBehavior, TorqueLanguageBehavior) {
+      static get is() {
+        return 'page-withdraw-from-change-wallet-balance';
+      }
+
+      static get properties() {
+        return {
+          editingCustomer: {
+            type: Object,
+            value: null
+          },
+          adjustCustomerBalanceForm: {
+            type: Object,
+            value: _ => {
+              if (mode === 'development') {
+                return {
+                  action: 'payment',
+                  amount: '100'
+                };
+              } else {
+                return {
+                  action: '',
+                  amount: ''
+                };
+              }
+            }
+          }
+        };
+      }
+
+      // region: core =================================
+
+      constructor() {
+        super();
+        this.confirmPageReady();
+      }
+
+      onNavigateIn() {
+        this.app.shouldShowSaveButton = false;
+        this.app.currentPageIsModal = true;
+        this.useLanguageServices();
+        this.app.pushPageTitle(this.app.verses.adjustCustomerBalance.adjustCustomerBalanceTitle);
+        if (!this._ensureAccess()) return;
+        if (!('customer' in this.params)) {
+          let message = this.app.verses.general.pageCannotBeDisplayed;
+          this.app.showModalDialog("Something went wrong!", message, _ => {
+            this.app.navigateTo('/home');
+          });
+          return;
+        }
+        this._processGetCustomer(() => {
+          this.isReady = true;
+        });
+      }
+
+      onNavigateOut() {
+        super.onNavigateOut();
+        this.app.popPageTitle();
+        this.resetProperties('adjustCustomerBalanceForm');
+        this.removeAutoValidation('#adjustCustomerBalanceForm paper-input');
+      }
+
+      _ensureAccess() {
+        return this.accessControl('privileged', ['PRIV_MANAGE_CUSTOMER_WALLET_BALANCE']);
+      }
+
+      // region: editCustomer =================================
+
+      _processGetCustomer(cbfn) {
+        let customerId = parseInt(this.params.customer);
+        let data = {
+          customerId
+        };
+        this.app.callGetCustomerApi(data, (err, response) => {
+          if (err) return;
+          if (response.hasError) return this.onApiError(response.error);
+          this.editingCustomer = response.customer;
+          cbfn();
+        });
+      }
+
+      _processAdjustCustomerBalance({ action, amount }) {
+        let data = {
+          action, amount,
+          customerId: this.editingCustomer.id
+        };
+        this.app.callAdjustCustomerBalanceApi(data, (err, response) => {
+          if (err) return;
+          if (response.hasError) return this.onApiError(response.error, 'adjustCustomerBalanceForm');
+          let message = this.app.verses.adjustCustomerBalance.customerBalanceUpdated;
+          this.app.showToast(message, _ => {
+            this.backButtonOnTopBarPressed();
+          });
+        });
+      }
+
+      // region: ui =================================
+
+      adjustCustomerBalanceTapped(e = null) {
+        this.elemAll('#adjustCustomerBalanceForm paper-input').forEach(el => el.autoValidate = true);
+        if (!this.elem('#adjustCustomerBalanceForm').validate()) return;
+
+        let { action, amount } = this.adjustCustomerBalanceForm;
+        this._processAdjustCustomerBalance({ action, amount });
+      }
+
+      backButtonOnTopBarPressed(e = null) {
+        this.app.navigateToPreviousUrl(`/view-customer/customer:${this.params.customer}`);
+      }
+
+    }
+
+    window.customElements.define(PageWithdrawFromChangeWalletBalance.is, PageWithdrawFromChangeWalletBalance);
+  </script>
+</dom-module>
diff --git a/client/src/torque-app.html b/client/src/torque-app.html
index cf8043417..15c0cac70 100644
--- a/client/src/torque-app.html
+++ b/client/src/torque-app.html
@@ -70,7 +70,7 @@
 <link rel="lazy-import" href="page-manage-customers.html">
 <link rel="lazy-import" href="page-view-customer.html">
 <link rel="lazy-import" href="page-edit-customer.html">
-<link rel="lazy-import" href="page-adjust-customer-balance.html">
+<link rel="lazy-import" href="page-withdraw-from-change-wallet-balance.html">
 <link rel="lazy-import" href="page-pos.html">
 <link rel="lazy-import" href="page-report-sales.html">
 <link rel="lazy-import" href="page-report-inventories.html">
@@ -303,7 +303,7 @@
           <page-manage-customers name="manage-customers"></page-manage-customers>
           <page-view-customer name="view-customer"></page-view-customer>
           <page-edit-customer name="edit-customer"></page-edit-customer>
-          <page-adjust-customer-balance name="adjust-customer-balance"></page-adjust-customer-balance>
+          <page-withdraw-from-change-wallet-balance name="withdraw-from-change-wallet-balance"></page-withdraw-from-change-wallet-balance>
           <page-pos name="pos"></page-pos>
           <page-report-sales name="report-sales"></page-report-sales>
           <page-report-inventories name="report-inventories"></page-report-inventories>
diff --git a/server/test/test-sales-apis.js b/server/test/test-sales-apis.js
index 1e38c5be4..a13db077e 100644
--- a/server/test/test-sales-apis.js
+++ b/server/test/test-sales-apis.js
@@ -85,7 +85,7 @@ let fromDate = new Date();
 fromDate.setDate(fromDate.getDate() - 1);
 fromDate = fromDate.getTime();
 
-describe.only('Sales', _ => {
+describe('Sales', _ => {
 
   it('START', testDoneFn => {
     initializeServer(_ => {

From 6c0d5d80d5f08cd93292e1b02c503cc73d5d7895 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Sat, 6 Oct 2018 20:58:09 +0600
Subject: [PATCH 40/74] working

---
 .../elem-common-employment-details-input.html    |  2 +-
 .../elem-common-employment-details-input.html    |  2 +-
 client/src/page-adjust-customer-balance.html     |  2 +-
 ...page-withdraw-from-change-wallet-balance.html |  2 +-
 meta/api-docs/get-employee-list.md               |  2 +-
 meta/api-docs/get-employee.md                    |  2 +-
 meta/server-db-docs/employment.md                |  2 +-
 server/scripts/bulk.js                           |  2 +-
 .../apis/withdraw-from-change-wallet-balance.js  |  2 +-
 server/src/collections/employment.js             |  4 ++--
 server/src/fixtures/privilege-list.json          |  2 +-
 server/src/legacy-apis/add-new-employee.js       |  2 +-
 .../src/legacy-apis/adjust-customer-balance.js   |  2 +-
 server/src/legacy-apis/edit-employment.js        |  2 +-
 server/src/legacy-apis/hire-user-as-employee.js  |  2 +-
 server/src/legacy-collections/employment.js      |  6 +++---
 server/test/lib.js                               |  2 +-
 server/test/test-employee-apis.js                | 16 ++++++++--------
 18 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/admin-client/src/elem-common-employment-details-input.html b/admin-client/src/elem-common-employment-details-input.html
index 4e2be22c4..409614e73 100644
--- a/admin-client/src/elem-common-employment-details-input.html
+++ b/admin-client/src/elem-common-employment-details-input.html
@@ -93,7 +93,7 @@ <h3>Privileges:</h3>
             "PRIV_VIEW_CUSTOMER",
             "PRIV_ADD_CUSTOMER_DURING_SALES",
             "PRIV_MODIFY_CUSTOMER",
-            "PRIV_MANAGE_CUSTOMER_WALLET_BALANCE"
+            "PRIV_MANAGE_CUSTOMER_DEBT"
           ]
           if (shouldSetDefaultPrivileges) {
             for (let privilege of this.privilegeList) {
diff --git a/client/src/elem-common-employment-details-input.html b/client/src/elem-common-employment-details-input.html
index e9bf05f7b..8e0404fb7 100644
--- a/client/src/elem-common-employment-details-input.html
+++ b/client/src/elem-common-employment-details-input.html
@@ -106,7 +106,7 @@ <h3>[[verses.commonEmploymentDetails.privileges]]:</h3>
             "PRIV_VIEW_CUSTOMER",
             "PRIV_ADD_CUSTOMER_DURING_SALES",
             "PRIV_MODIFY_CUSTOMER",
-            "PRIV_MANAGE_CUSTOMER_WALLET_BALANCE"
+            "PRIV_MANAGE_CUSTOMER_DEBT"
           ]
           if (shouldSetDefaultPrivileges) {
             for (let privilege of this.privilegeList) {
diff --git a/client/src/page-adjust-customer-balance.html b/client/src/page-adjust-customer-balance.html
index b62724e2b..30f4b9c1f 100644
--- a/client/src/page-adjust-customer-balance.html
+++ b/client/src/page-adjust-customer-balance.html
@@ -118,7 +118,7 @@
       }
 
       _ensureAccess() {
-        return this.accessControl('privileged', ['PRIV_MANAGE_CUSTOMER_WALLET_BALANCE']);
+        return this.accessControl('privileged', ['PRIV_MANAGE_CUSTOMER_DEBT']);
       }
 
       // region: editCustomer =================================
diff --git a/client/src/page-withdraw-from-change-wallet-balance.html b/client/src/page-withdraw-from-change-wallet-balance.html
index 1f2de0832..678ce769c 100644
--- a/client/src/page-withdraw-from-change-wallet-balance.html
+++ b/client/src/page-withdraw-from-change-wallet-balance.html
@@ -114,7 +114,7 @@
       }
 
       _ensureAccess() {
-        return this.accessControl('privileged', ['PRIV_MANAGE_CUSTOMER_WALLET_BALANCE']);
+        return this.accessControl('privileged', ['PRIV_MANAGE_CUSTOMER_DEBT']);
       }
 
       // region: editCustomer =================================
diff --git a/meta/api-docs/get-employee-list.md b/meta/api-docs/get-employee-list.md
index 7c36f4b7b..d23b1f40d 100644
--- a/meta/api-docs/get-employee-list.md
+++ b/meta/api-docs/get-employee-list.md
@@ -88,7 +88,7 @@ Possible Error Codes:
         PRIV_VIEW_CUSTOMER: Joi.boolean().required(),
         PRIV_ADD_CUSTOMER_DURING_SALES: Joi.boolean().required(),
         PRIV_MODIFY_CUSTOMER: Joi.boolean().required(),
-        PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: Joi.boolean().required()
+        PRIV_MANAGE_CUSTOMER_DEBT: Joi.boolean().required()
       }),
       isActive: Joi.boolean().required()
     });
diff --git a/meta/api-docs/get-employee.md b/meta/api-docs/get-employee.md
index 4159248d0..e25eb7437 100644
--- a/meta/api-docs/get-employee.md
+++ b/meta/api-docs/get-employee.md
@@ -88,7 +88,7 @@ Possible Error Codes:
       PRIV_VIEW_CUSTOMER: Joi.boolean().required(),
       PRIV_ADD_CUSTOMER_DURING_SALES: Joi.boolean().required(),
       PRIV_MODIFY_CUSTOMER: Joi.boolean().required(),
-      PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: Joi.boolean().required()
+      PRIV_MANAGE_CUSTOMER_DEBT: Joi.boolean().required()
     }),
     isActive: Joi.boolean().required()
   });
diff --git a/meta/server-db-docs/employment.md b/meta/server-db-docs/employment.md
index 6504030ee..37a58cad2 100644
--- a/meta/server-db-docs/employment.md
+++ b/meta/server-db-docs/employment.md
@@ -46,7 +46,7 @@ Joi.object().keys({
     PRIV_VIEW_CUSTOMER: Joi.boolean().required(),
     PRIV_ADD_CUSTOMER_DURING_SALES: Joi.boolean().required(),
     PRIV_MODIFY_CUSTOMER: Joi.boolean().required(),
-    PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: Joi.boolean().required()
+    PRIV_MANAGE_CUSTOMER_DEBT: Joi.boolean().required()
   }),
   isActive: Joi.boolean().required()
 });
diff --git a/server/scripts/bulk.js b/server/scripts/bulk.js
index 2d9e6bbb6..9aad79447 100644
--- a/server/scripts/bulk.js
+++ b/server/scripts/bulk.js
@@ -231,7 +231,7 @@ const createEmployee = async ({ apiKey, organizationId }) => {
       PRIV_VIEW_CUSTOMER: true,
       PRIV_ADD_CUSTOMER_DURING_SALES: true,
       PRIV_MODIFY_CUSTOMER: true,
-      PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: true
+      PRIV_MANAGE_CUSTOMER_DEBT: true
     }
   });
 
diff --git a/server/src/apis/withdraw-from-change-wallet-balance.js b/server/src/apis/withdraw-from-change-wallet-balance.js
index 5bf84e89f..84c0a4878 100644
--- a/server/src/apis/withdraw-from-change-wallet-balance.js
+++ b/server/src/apis/withdraw-from-change-wallet-balance.js
@@ -28,7 +28,7 @@ exports.WithdrawFromChangeWalletBalanceApi = class extends Api.mixin(CustomerMix
         errorCode: "CUSTOMER_INVALID"
       },
       privileges: [
-        "PRIV_MANAGE_CUSTOMER_WALLET_BALANCE"
+        "PRIV_MANAGE_CUSTOMER_DEBT"
       ]
     }];
   }
diff --git a/server/src/collections/employment.js b/server/src/collections/employment.js
index 9b8406e6a..0702cde73 100644
--- a/server/src/collections/employment.js
+++ b/server/src/collections/employment.js
@@ -49,7 +49,7 @@ exports.EmploymentCollection = class extends Collection {
         PRIV_VIEW_CUSTOMER: Joi.boolean().required(),
         PRIV_ADD_CUSTOMER_DURING_SALES: Joi.boolean().required(),
         PRIV_MODIFY_CUSTOMER: Joi.boolean().required(),
-        PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: Joi.boolean().required()
+        PRIV_MANAGE_CUSTOMER_DEBT: Joi.boolean().required()
       }),
       isActive: Joi.boolean().required()
     });
@@ -109,7 +109,7 @@ exports.EmploymentCollection = class extends Collection {
       "PRIV_VIEW_CUSTOMER",
       "PRIV_ADD_CUSTOMER_DURING_SALES",
       "PRIV_MODIFY_CUSTOMER",
-      "PRIV_MANAGE_CUSTOMER_WALLET_BALANCE"
+      "PRIV_MANAGE_CUSTOMER_DEBT"
     ];
   }
 
diff --git a/server/src/fixtures/privilege-list.json b/server/src/fixtures/privilege-list.json
index 59a4f3472..4cd9176ac 100644
--- a/server/src/fixtures/privilege-list.json
+++ b/server/src/fixtures/privilege-list.json
@@ -104,7 +104,7 @@
     "name": "Modify customer"
   },
   {
-    "code": "PRIV_MANAGE_CUSTOMER_WALLET_BALANCE",
+    "code": "PRIV_MANAGE_CUSTOMER_DEBT",
     "name": "Manage customer debt"
   }
 ]
\ No newline at end of file
diff --git a/server/src/legacy-apis/add-new-employee.js b/server/src/legacy-apis/add-new-employee.js
index 3e23184b9..c5ca5e20b 100644
--- a/server/src/legacy-apis/add-new-employee.js
+++ b/server/src/legacy-apis/add-new-employee.js
@@ -58,7 +58,7 @@ exports.AddNewEmployeeApi = class extends phoneVerificationRequestMixin(userComm
         PRIV_VIEW_CUSTOMER: Joi.boolean().required(),
         PRIV_ADD_CUSTOMER_DURING_SALES: Joi.boolean().required(),
         PRIV_MODIFY_CUSTOMER: Joi.boolean().required(),
-        PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: Joi.boolean().required()
+        PRIV_MANAGE_CUSTOMER_DEBT: Joi.boolean().required()
       })
     });
   }
diff --git a/server/src/legacy-apis/adjust-customer-balance.js b/server/src/legacy-apis/adjust-customer-balance.js
index bbd556810..1a3bf2b4d 100644
--- a/server/src/legacy-apis/adjust-customer-balance.js
+++ b/server/src/legacy-apis/adjust-customer-balance.js
@@ -32,7 +32,7 @@ exports.AdjustCustomerBalanceApi = class extends collectionCommonMixin(customerC
         errorCode: "CUSTOMER_INVALID"
       },
       privileges: [
-        "PRIV_MANAGE_CUSTOMER_WALLET_BALANCE"
+        "PRIV_MANAGE_CUSTOMER_DEBT"
       ]
     }];
   }
diff --git a/server/src/legacy-apis/edit-employment.js b/server/src/legacy-apis/edit-employment.js
index 1f3cfe597..7fa6db46e 100644
--- a/server/src/legacy-apis/edit-employment.js
+++ b/server/src/legacy-apis/edit-employment.js
@@ -55,7 +55,7 @@ exports.EditEmploymentApi = class extends userCommonMixin(collectionCommonMixin(
         PRIV_VIEW_CUSTOMER: Joi.boolean().required(),
         PRIV_ADD_CUSTOMER_DURING_SALES: Joi.boolean().required(),
         PRIV_MODIFY_CUSTOMER: Joi.boolean().required(),
-        PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: Joi.boolean().required()
+        PRIV_MANAGE_CUSTOMER_DEBT: Joi.boolean().required()
       })
     });
   }
diff --git a/server/src/legacy-apis/hire-user-as-employee.js b/server/src/legacy-apis/hire-user-as-employee.js
index a8ff7f489..589134a64 100644
--- a/server/src/legacy-apis/hire-user-as-employee.js
+++ b/server/src/legacy-apis/hire-user-as-employee.js
@@ -55,7 +55,7 @@ exports.HireUserAsEmployeeApi = class extends userCommonMixin(collectionCommonMi
         PRIV_VIEW_CUSTOMER: Joi.boolean().required(),
         PRIV_ADD_CUSTOMER_DURING_SALES: Joi.boolean().required(),
         PRIV_MODIFY_CUSTOMER: Joi.boolean().required(),
-        PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: Joi.boolean().required()
+        PRIV_MANAGE_CUSTOMER_DEBT: Joi.boolean().required()
       })
     });
   }
diff --git a/server/src/legacy-collections/employment.js b/server/src/legacy-collections/employment.js
index c217c80df..4f56dafa3 100644
--- a/server/src/legacy-collections/employment.js
+++ b/server/src/legacy-collections/employment.js
@@ -62,7 +62,7 @@ exports.EmploymentCollection = class extends LegacyCollection {
         PRIV_VIEW_CUSTOMER: Joi.boolean().required(),
         PRIV_ADD_CUSTOMER_DURING_SALES: Joi.boolean().required(),
         PRIV_MODIFY_CUSTOMER: Joi.boolean().required(),
-        PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: Joi.boolean().required()
+        PRIV_MANAGE_CUSTOMER_DEBT: Joi.boolean().required()
       }),
       isActive: Joi.boolean().required(),
     });
@@ -123,7 +123,7 @@ exports.EmploymentCollection = class extends LegacyCollection {
       "PRIV_VIEW_CUSTOMER",
       "PRIV_ADD_CUSTOMER_DURING_SALES",
       "PRIV_MODIFY_CUSTOMER",
-      "PRIV_MANAGE_CUSTOMER_WALLET_BALANCE"
+      "PRIV_MANAGE_CUSTOMER_DEBT"
     ];
 
     let employeeDefaultPrivilegeList = [
@@ -160,7 +160,7 @@ exports.EmploymentCollection = class extends LegacyCollection {
       "PRIV_VIEW_CUSTOMER",
       "PRIV_ADD_CUSTOMER_DURING_SALES",
       "PRIV_MODIFY_CUSTOMER",
-      "PRIV_MANAGE_CUSTOMER_WALLET_BALANCE"
+      "PRIV_MANAGE_CUSTOMER_DEBT"
     ];
 
     let privileges = {};
diff --git a/server/test/lib.js b/server/test/lib.js
index 8c776393f..5a76a7343 100644
--- a/server/test/lib.js
+++ b/server/test/lib.js
@@ -1238,7 +1238,7 @@ exports.validateEmploymentSchema = (doc) => {
       PRIV_VIEW_CUSTOMER: Joi.boolean().required(),
       PRIV_ADD_CUSTOMER_DURING_SALES: Joi.boolean().required(),
       PRIV_MODIFY_CUSTOMER: Joi.boolean().required(),
-      PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: Joi.boolean().required()
+      PRIV_MANAGE_CUSTOMER_DEBT: Joi.boolean().required()
     }),
 
     isActive: Joi.boolean().required()
diff --git a/server/test/test-employee-apis.js b/server/test/test-employee-apis.js
index 111b99ba1..5bcf9092e 100644
--- a/server/test/test-employee-apis.js
+++ b/server/test/test-employee-apis.js
@@ -165,7 +165,7 @@ describe('Employee', _ => {
           PRIV_VIEW_CUSTOMER: true,
           PRIV_ADD_CUSTOMER_DURING_SALES: true,
           PRIV_MODIFY_CUSTOMER: true,
-          PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: true
+          PRIV_MANAGE_CUSTOMER_DEBT: true
         }
       }
     }, (err, response, body) => {
@@ -221,7 +221,7 @@ describe('Employee', _ => {
           PRIV_VIEW_CUSTOMER: true,
           PRIV_ADD_CUSTOMER_DURING_SALES: true,
           PRIV_MODIFY_CUSTOMER: true,
-          PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: true
+          PRIV_MANAGE_CUSTOMER_DEBT: true
         }
       }
     }, (err, response, body) => {
@@ -276,7 +276,7 @@ describe('Employee', _ => {
           PRIV_VIEW_CUSTOMER: true,
           PRIV_ADD_CUSTOMER_DURING_SALES: true,
           PRIV_MODIFY_CUSTOMER: true,
-          PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: true
+          PRIV_MANAGE_CUSTOMER_DEBT: true
         }
       }
     }, (err, response, body) => {
@@ -332,7 +332,7 @@ describe('Employee', _ => {
           PRIV_VIEW_CUSTOMER: true,
           PRIV_ADD_CUSTOMER_DURING_SALES: true,
           PRIV_MODIFY_CUSTOMER: true,
-          PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: true
+          PRIV_MANAGE_CUSTOMER_DEBT: true
         }
       }
     }, (err, response, body) => {
@@ -498,7 +498,7 @@ describe('Employee', _ => {
           PRIV_VIEW_CUSTOMER: true,
           PRIV_ADD_CUSTOMER_DURING_SALES: true,
           PRIV_MODIFY_CUSTOMER: true,
-          PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: true
+          PRIV_MANAGE_CUSTOMER_DEBT: true
         }
       }
     }, (err, response, body) => {
@@ -559,7 +559,7 @@ describe('Employee', _ => {
           PRIV_VIEW_CUSTOMER: true,
           PRIV_ADD_CUSTOMER_DURING_SALES: true,
           PRIV_MODIFY_CUSTOMER: true,
-          PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: true
+          PRIV_MANAGE_CUSTOMER_DEBT: true
         }
       }
     }, (err, response, body) => {
@@ -620,7 +620,7 @@ describe('Employee', _ => {
           PRIV_VIEW_CUSTOMER: true,
           PRIV_ADD_CUSTOMER_DURING_SALES: true,
           PRIV_MODIFY_CUSTOMER: true,
-          PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: true
+          PRIV_MANAGE_CUSTOMER_DEBT: true
         }
       }
     }, (err, response, body) => {
@@ -858,7 +858,7 @@ describe('Employee', _ => {
           PRIV_VIEW_CUSTOMER: true,
           PRIV_ADD_CUSTOMER_DURING_SALES: true,
           PRIV_MODIFY_CUSTOMER: true,
-          PRIV_MANAGE_CUSTOMER_WALLET_BALANCE: true
+          PRIV_MANAGE_CUSTOMER_DEBT: true
         }
       }
     }, (err, response, body) => {

From ae8c7771b22295cb26fb4ed71550383fcd7653a8 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Sat, 6 Oct 2018 21:20:31 +0600
Subject: [PATCH 41/74] withdraw-from-change-wallet-balance done

---
 client/src/lang-bn-bd.json                    |  7 ++++
 client/src/lang-en-us.json                    |  7 ++++
 ...e-withdraw-from-change-wallet-balance.html | 38 +++++++++----------
 client/src/torque-http-behavior.html          |  4 +-
 .../withdraw-from-change-wallet-balance.js    | 13 +++++++
 server/test/test-sales-apis.js                |  4 +-
 6 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/client/src/lang-bn-bd.json b/client/src/lang-bn-bd.json
index eb4ec045e..39e806a2b 100644
--- a/client/src/lang-bn-bd.json
+++ b/client/src/lang-bn-bd.json
@@ -684,5 +684,12 @@
     "fileProvidedHasNoData": "প্রদত্ত ফাইলটিতে কোনো তথ্য নেই।",
     "expectedColumn": "প্রত্যাশিত কলাম",
     "missingCellsInRow": "নং শাড়িতে তথ্য নেই"
+  },
+  "withdrawFromChangeWalletBalance": {
+    "withdrawFromChangeWalletBalanceTitle": "Withdraw from change wallet balance",
+    "amountInput": "অর্থ পরিমাণ",
+    "amountInputError": "অর্থ পরিমাণ লিখুন",
+    "withdraw": "সরান",
+    "customerBalanceUpdated": "গ্রাহকের change wallet ব্যালান্স আপডেট হয়ে গিয়েছে।"
   }
 }
\ No newline at end of file
diff --git a/client/src/lang-en-us.json b/client/src/lang-en-us.json
index 3f4c8c7c8..f7ac92b6c 100644
--- a/client/src/lang-en-us.json
+++ b/client/src/lang-en-us.json
@@ -682,5 +682,12 @@
     "fileProvidedHasNoData": "The file you provided has no data.",
     "expectedColumn": "Expected column",
     "missingCellsInRow": "No row missing data"
+  },
+  "withdrawFromChangeWalletBalance": {
+    "withdrawFromChangeWalletBalanceTitle": "Withdraw from change wallet balance",
+    "amountInput": "Amount",
+    "amountInputError": "Enter the amount",
+    "withdraw": "Withdraw",
+    "customerBalanceUpdated": "Customer's change wallet balance has been updated."
   }
 }
\ No newline at end of file
diff --git a/client/src/page-withdraw-from-change-wallet-balance.html b/client/src/page-withdraw-from-change-wallet-balance.html
index 678ce769c..e7bc20cbf 100644
--- a/client/src/page-withdraw-from-change-wallet-balance.html
+++ b/client/src/page-withdraw-from-change-wallet-balance.html
@@ -33,15 +33,13 @@
     <elem-not-ready is-ready="[[isReady]]"></elem-not-ready>
 
     <div class$="page layout vertical [[$if(isReady, '', 'hidden')]]" id="wrapper">
-      <iron-form id="adjustCustomerBalanceForm">
+      <iron-form id="withdrawFromChangeWalletBalanceForm">
         <form>
           <div class="card vertical layout">
 
-            <paper-input class="adjustCustomerBalanceForm--amount" value="{{adjustCustomerBalanceForm.amount}}" type="number" required minlength="1" maxlength="10" error-message=[[verses.adjustCustomerBalance.amountInputError]] label=[[verses.adjustCustomerBalance.amountInput]]></paper-input>
-            <div class="horizontal layout button-row end">
-              <div class="flex"></div>
-              <paper-button raised class="primary" on-tap="adjustCustomerBalanceTapped">[[verses.adjustCustomerBalance.adjust]]</paper-button>
-            </div>
+            <div>[[verses.general.changeWallet]]: [[$round(editingCustomer.changeWalletBalance)]] [[app.settings.monetaryUnit]]</div>
+            <paper-input class="withdrawFromChangeWalletBalanceForm--amount" value="{{withdrawFromChangeWalletBalanceForm.amount}}" type="number" required min="1" max="[[editingCustomer.changeWalletBalance]]" error-message=[[verses.withdrawFromChangeWalletBalance.amountInputError]] label=[[verses.withdrawFromChangeWalletBalance.amountInput]]></paper-input>
+            <paper-button raised class="primary" on-tap="withdrawFromChangeWalletBalanceTapped">[[verses.withdrawFromChangeWalletBalance.withdraw]]</paper-button>
 
           </div>
         </form>
@@ -62,17 +60,15 @@
             type: Object,
             value: null
           },
-          adjustCustomerBalanceForm: {
+          withdrawFromChangeWalletBalanceForm: {
             type: Object,
             value: _ => {
               if (mode === 'development') {
                 return {
-                  action: 'payment',
                   amount: '100'
                 };
               } else {
                 return {
-                  action: '',
                   amount: ''
                 };
               }
@@ -92,7 +88,7 @@
         this.app.shouldShowSaveButton = false;
         this.app.currentPageIsModal = true;
         this.useLanguageServices();
-        this.app.pushPageTitle(this.app.verses.adjustCustomerBalance.adjustCustomerBalanceTitle);
+        this.app.pushPageTitle(this.app.verses.withdrawFromChangeWalletBalance.withdrawFromChangeWalletBalanceTitle);
         if (!this._ensureAccess()) return;
         if (!('customer' in this.params)) {
           let message = this.app.verses.general.pageCannotBeDisplayed;
@@ -109,8 +105,8 @@
       onNavigateOut() {
         super.onNavigateOut();
         this.app.popPageTitle();
-        this.resetProperties('adjustCustomerBalanceForm');
-        this.removeAutoValidation('#adjustCustomerBalanceForm paper-input');
+        this.resetProperties('withdrawFromChangeWalletBalanceForm');
+        this.removeAutoValidation('#withdrawFromChangeWalletBalanceForm paper-input');
       }
 
       _ensureAccess() {
@@ -132,15 +128,15 @@
         });
       }
 
-      _processAdjustCustomerBalance({ action, amount }) {
+      _processWithdrawFromChangeWalletBalance({ action, amount }) {
         let data = {
           action, amount,
           customerId: this.editingCustomer.id
         };
-        this.app.callAdjustCustomerBalanceApi(data, (err, response) => {
+        this.app.callWithdrawFromChangeWalletBalanceApi(data, (err, response) => {
           if (err) return;
-          if (response.hasError) return this.onApiError(response.error, 'adjustCustomerBalanceForm');
-          let message = this.app.verses.adjustCustomerBalance.customerBalanceUpdated;
+          if (response.hasError) return this.onApiError(response.error, 'withdrawFromChangeWalletBalanceForm');
+          let message = this.app.verses.withdrawFromChangeWalletBalance.customerBalanceUpdated;
           this.app.showToast(message, _ => {
             this.backButtonOnTopBarPressed();
           });
@@ -149,12 +145,12 @@
 
       // region: ui =================================
 
-      adjustCustomerBalanceTapped(e = null) {
-        this.elemAll('#adjustCustomerBalanceForm paper-input').forEach(el => el.autoValidate = true);
-        if (!this.elem('#adjustCustomerBalanceForm').validate()) return;
+      withdrawFromChangeWalletBalanceTapped(e = null) {
+        this.elemAll('#withdrawFromChangeWalletBalanceForm paper-input').forEach(el => el.autoValidate = true);
+        if (!this.elem('#withdrawFromChangeWalletBalanceForm').validate()) return;
 
-        let { action, amount } = this.adjustCustomerBalanceForm;
-        this._processAdjustCustomerBalance({ action, amount });
+        let { action, amount } = this.withdrawFromChangeWalletBalanceForm;
+        this._processWithdrawFromChangeWalletBalance({ action, amount });
       }
 
       backButtonOnTopBarPressed(e = null) {
diff --git a/client/src/torque-http-behavior.html b/client/src/torque-http-behavior.html
index 8b4070a1b..b1ce3f387 100644
--- a/client/src/torque-http-behavior.html
+++ b/client/src/torque-http-behavior.html
@@ -342,9 +342,9 @@
         this.callCombinedJsonApi('delete-customer', data, cbfn);
       }
 
-      callAdjustCustomerBalanceApi(data, cbfn) {
+      callWithdrawFromChangeWalletBalanceApi(data, cbfn) {
         if (!this._applyApiKey(data)) return;
-        this.callCombinedJsonApi('adjust-customer-balance', data, cbfn);
+        this.callCombinedJsonApi('withdraw-from-change-wallet-balance', data, cbfn);
       }
 
       callUserSetEmailApi(data, cbfn) {
diff --git a/server/src/apis/withdraw-from-change-wallet-balance.js b/server/src/apis/withdraw-from-change-wallet-balance.js
index 84c0a4878..7cd093319 100644
--- a/server/src/apis/withdraw-from-change-wallet-balance.js
+++ b/server/src/apis/withdraw-from-change-wallet-balance.js
@@ -33,11 +33,24 @@ exports.WithdrawFromChangeWalletBalanceApi = class extends Api.mixin(CustomerMix
     }];
   }
 
+  async _addToCustomerWithdrawalHistory({ customer, amount, userId }) {
+    let withdrawalHistory = customer.withdrawalHistory;
+    withdrawalHistory.push({
+      creditedDatetimeStamp: (new Date).getTime(),
+      byUserId: userId,
+      amount
+    });
+
+    let doc = await this.database.customer.setWithdrawalHistory({ id: customer.id }, { withdrawalHistory });
+    return;
+  }
+
   async handle({ body, userId }) {
     let { customerId, amount } = body;
 
     let customer = await this.database.customer.findById({ id: customerId });
     await this._deductFromChangeWalletAsPayment({ customer, amount });
+    await this._addToCustomerWithdrawalHistory({ customer, amount, userId });
 
     return { status: "success" };
   }
diff --git a/server/test/test-sales-apis.js b/server/test/test-sales-apis.js
index a13db077e..8878e2a12 100644
--- a/server/test/test-sales-apis.js
+++ b/server/test/test-sales-apis.js
@@ -85,7 +85,7 @@ let fromDate = new Date();
 fromDate.setDate(fromDate.getDate() - 1);
 fromDate = fromDate.getTime();
 
-describe('Sales', _ => {
+describe.only('Sales', _ => {
 
   it('START', testDoneFn => {
     initializeServer(_ => {
@@ -899,7 +899,7 @@ describe('Sales', _ => {
       validateGetCustomerApiSuccessResponse(body);
       validateCustomerSchema(body.customer);
 
-      expect(body.customer).to.have.property('withdrawalHistory').to.have.lengthOf(0);
+      expect(body.customer).to.have.property('withdrawalHistory').to.have.lengthOf(1);
 
       testDoneFn();
     })

From 00bd9ad5d205f1809dcfd7a115aabb33217edbd4 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Sat, 6 Oct 2018 21:25:34 +0600
Subject: [PATCH 42/74] page-view-customer styled

---
 client/src/page-view-customer.html | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/client/src/page-view-customer.html b/client/src/page-view-customer.html
index a47bd6968..2b416e11a 100644
--- a/client/src/page-view-customer.html
+++ b/client/src/page-view-customer.html
@@ -29,6 +29,18 @@
       margin: 5px;
     }
 
+    .withdrawal-history-title {
+      font-weight: bold;
+      margin-top: 6px;
+    }
+
+    .list-object {
+      border: 1px solid #eee;
+      background-color: #f7f7f7;
+      padding: 6px;
+      margin: 4px 0px;
+    }
+
     </style>
 
     <elem-not-ready is-ready="[[isReady]]"></elem-not-ready>
@@ -48,14 +60,19 @@
           <paper-button raised class="secondary" on-tap="withdrawFromChangeWalletBalanceTapped">[[verses.customer.withdrawFromChangeWalletBalance]]</paper-button>
 
           <template is="dom-if" if="[[customer.withdrawalHistory.length]]">
-            [[verses.customer.withdrawalHistory]]:
+            <div class="withdrawal-history-title">[[verses.customer.withdrawalHistory]]:</div>
+
             <template is="dom-repeat" items="[[customer.withdrawalHistory]]" as="withdrawal">
-              <div>
-                <b>#[[index]]</b> [[verses.general.date]]: [[$mkDate(withdrawal.creditedDatetimeStamp, 'hh:mmtt dd-MM-yyyy')]]
-              </div>
-              <div>
-                [[verses.general.amount]]: [[$round(withdrawal.amount)]] [[app.settings.monetaryUnit]]
+
+              <div class="list-object">
+                <div>
+                  <b>#[[index]]</b> [[verses.general.date]]: [[$mkDate(withdrawal.creditedDatetimeStamp, 'hh:mmtt dd-MM-yyyy')]]
+                </div>
+                <div>
+                  [[verses.general.amount]]: [[$round(withdrawal.amount)]] [[app.settings.monetaryUnit]]
+                </div>
               </div>
+
             </template>
           </template>
 

From 1f036d4707cbd25dd9689e8257be80042d1b3148 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Sat, 6 Oct 2018 21:27:09 +0600
Subject: [PATCH 43/74] genericNumericInputChanged added to
 PageWithdrawFromChangeWalletBalance

---
 client/src/page-withdraw-from-change-wallet-balance.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/src/page-withdraw-from-change-wallet-balance.html b/client/src/page-withdraw-from-change-wallet-balance.html
index e7bc20cbf..79b03b282 100644
--- a/client/src/page-withdraw-from-change-wallet-balance.html
+++ b/client/src/page-withdraw-from-change-wallet-balance.html
@@ -38,7 +38,7 @@
           <div class="card vertical layout">
 
             <div>[[verses.general.changeWallet]]: [[$round(editingCustomer.changeWalletBalance)]] [[app.settings.monetaryUnit]]</div>
-            <paper-input class="withdrawFromChangeWalletBalanceForm--amount" value="{{withdrawFromChangeWalletBalanceForm.amount}}" type="number" required min="1" max="[[editingCustomer.changeWalletBalance]]" error-message=[[verses.withdrawFromChangeWalletBalance.amountInputError]] label=[[verses.withdrawFromChangeWalletBalance.amountInput]]></paper-input>
+            <paper-input class="withdrawFromChangeWalletBalanceForm--amount" value="{{withdrawFromChangeWalletBalanceForm.amount}}" type="number" required min="1" max="[[editingCustomer.changeWalletBalance]]" on-input="genericNumericInputChanged" on-change="genericNumericInputChanged" error-message=[[verses.withdrawFromChangeWalletBalance.amountInputError]] label=[[verses.withdrawFromChangeWalletBalance.amountInput]]></paper-input>
             <paper-button raised class="primary" on-tap="withdrawFromChangeWalletBalanceTapped">[[verses.withdrawFromChangeWalletBalance.withdraw]]</paper-button>
 
           </div>
@@ -157,6 +157,10 @@
         this.app.navigateToPreviousUrl(`/view-customer/customer:${this.params.customer}`);
       }
 
+      genericNumericInputChanged(e) {
+        this.enforceMinMaxOnPaperInput(e);
+      }
+
     }
 
     window.customElements.define(PageWithdrawFromChangeWalletBalance.is, PageWithdrawFromChangeWalletBalance);

From 0e900ab3d73299cf6510719df1afc8ef71c535a8 Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Sun, 7 Oct 2018 02:09:17 +0600
Subject: [PATCH 44/74] Fixed typo

---
 client/src/lang-en-us.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/lang-en-us.json b/client/src/lang-en-us.json
index f7ac92b6c..c94ee20d0 100644
--- a/client/src/lang-en-us.json
+++ b/client/src/lang-en-us.json
@@ -464,7 +464,7 @@
     "vat": "VAT",
     "paidAmount": "Paid Amount",
     "totalPaid": "Total Paid Amount",
-    "paymentList": "Payemnt list",
+    "paymentList": "Payment list",
     "paymentMethod": "Payment Method",
     "changeAmount": "Change Amount",
     "wasDebitedToUser": "was debited to user.",

From 963a8de0fe7e5cbd1505c545a9670d07d6727cce Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Sun, 7 Oct 2018 02:12:46 +0600
Subject: [PATCH 45/74] Updated denied credit sales message

---
 server/src/apis/add-sales.js                | 2 +-
 server/src/legacy-apis/__depr__add-sales.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/apis/add-sales.js b/server/src/apis/add-sales.js
index 54c3d56d9..e0ec7e463 100644
--- a/server/src/apis/add-sales.js
+++ b/server/src/apis/add-sales.js
@@ -68,7 +68,7 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
     // Also should validate the new payment portion. i.e. paidAmount > changeAmount etc
     // Also, if paymentMethod is 'change-wallet' then customer must exist
     if (payment.totalBilled > (payment.totalPaidAmount + newPayment.paidAmount)) {
-      throwOnFalsy(customer, "CREDIT_SALE_NOT_ALLOWED_WITHOUT_CUSTOMER", "credit sale is not allowed without registered cutomer");
+      throwOnFalsy(customer, "CREDIT_SALE_NOT_ALLOWED_WITHOUT_CUSTOMER", "Credit sale is not allowed without a registered cutomer.");
     }
     return;
   }
diff --git a/server/src/legacy-apis/__depr__add-sales.js b/server/src/legacy-apis/__depr__add-sales.js
index 1f9d44fbd..0ab11ea58 100644
--- a/server/src/legacy-apis/__depr__add-sales.js
+++ b/server/src/legacy-apis/__depr__add-sales.js
@@ -86,7 +86,7 @@ exports.AddSalesApi = class extends inventoryCommonMixin(customerCommonMixin(col
           return cbfn(payment);
         });
       } else {
-        let err = new Error("credit sale is not allowed without registered cutomer");
+        let err = new Error("Credit sale is not allowed without a registered cutomer.");
         err.code = "CREDIT_SALE_NOT_ALLOWED_WITHOUT_CUSTOMER";
         return this.fail(err);
       }

From 904ab80f13c1b080287f66e44b238636fa308a28 Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Sun, 7 Oct 2018 02:13:09 +0600
Subject: [PATCH 46/74] Updated ElemAdditionalPayment

---
 client/src/elem-additional-payment.html | 52 +++++++------------------
 client/src/page-pos.html                |  4 +-
 client/src/page-view-sales.html         |  2 +-
 3 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/client/src/elem-additional-payment.html b/client/src/elem-additional-payment.html
index e92f99dd7..2afe94145 100644
--- a/client/src/elem-additional-payment.html
+++ b/client/src/elem-additional-payment.html
@@ -34,41 +34,16 @@
         padding: 6px;
         margin: 8px 0px;
       }
+
+      .full-width-paper-dropdown {
+        width: 100%;
+      }
     </style>
     <div class="card p-0 vertical layout">
-      <!-- 
-      <div class="p-16 horizontal layout center">
-        <paper-input class="flex" value="{{searchString}}" required minlength="0" error-message=[[verses.customerSelector.customerNameOrPhoneInputError]] label=[[verses.customerSelector.customerNameOrPhoneInput]] on-keypress="searchFieldKeypressed"></paper-input>
-        <paper-icon-button icon="clear" on-tap="cancelTapped"></paper-icon-button>
-        <paper-button raised class="primary" on-tap="searchTapped">
-          [[verses.general.search]]
-        </paper-button>
-      </div>
-
-      <paper-listbox>
-        <template is="dom-repeat" items="[[customerList]]" as="customer" index-as="customerIndex">
-          <paper-item class="custom layout horizontal center">
-            <div class="flex">
-              <div class="type body capitalize">[[customer.fullName]]</div>
-              <div class="horizontal layout wrap type secondary">
-                <div class="horizontal layout center m-right-8">
-                  <iron-icon icon="hardware:smartphone" class="icon small"></iron-icon>
-                  <div class="type caption-2">[[customer.phone]]</div>
-                </div>
-                <div class="horizontal layout center">
-                  <iron-icon icon="editor:attach-money" class="icon small"></iron-icon>
-                  <div class="type caption-2">[[customer.changeWalletBalance]] [[page.app.settings.monetaryUnit]]</div>
-                </div>
-              </div>
-            </div>
-            <paper-button raised class="primary btn btn-default" on-tap="selectTapped">[[verses.general.select]]</paper-button>
-          </paper-item>
-      </paper-listbox>
-      </template> -->
-
       <div class="list">
 
         <div class="individual-calculation-field-container">
+          <!-- TRANSLATE -->
           Due amount:
           <b>{{$round(amountLeftToPay)}} [[page.app.settings.monetaryUnit]]</b>
         </div>
@@ -92,11 +67,9 @@
             </paper-input>
           </template>
 
-
           <template is="dom-if" if="[[payment.changeAmount]]">
             <br> [[verses.pos.changeAmount]]:
             <b>{{$round(payment.changeAmount)}} [[app.settings.monetaryUnit]]</b>
-
             <br>
             <template is="dom-if" if="[[customer]]">
               <template is="dom-if" if="[[payment.changeAmount]]">
@@ -107,12 +80,14 @@
             </template>
           </template>
 
-
         </div>
 
-        <div class="horizontal layout m-top-16">
-          <paper-button raised class="primary flex" on-tap="saveSaleTapped">[[verses.pos.confirmSales]]</paper-button>
-        </div>
+        <template is="dom-if" if="[[isFromViewSalesPage]]">
+          <!-- TRANSLATE -->
+          <div class="horizontal layout m-top-16">
+            <paper-button raised class="primary flex" on-tap="addPaymentTapped">Add Payment</paper-button>
+          </div>
+        </template>
 
       </div>
   </template>
@@ -123,6 +98,10 @@
 
       static get properties() {
         return {
+          isFromViewSalesPage: {
+            type: Boolean,
+            value: false
+          },
           amountLeftToPay: {
             type: Number,
             value: 0
@@ -151,7 +130,6 @@
         if (!this.page) return;
       }
 
-
       paymentMethodSelected(e) {
         // NOTE: The timeout should not be necessary. However, without it
         // the value of this.payment.paymentMethod is not being updated in time.
diff --git a/client/src/page-pos.html b/client/src/page-pos.html
index 14e9ab65b..464c9d657 100644
--- a/client/src/page-pos.html
+++ b/client/src/page-pos.html
@@ -234,7 +234,7 @@
                 </paper-input>
               </template>
 
-              
+
               <template is="dom-if" if="[[payment.changeAmount]]">
                 <br> [[verses.pos.changeAmount]]:
                 <b>{{$round(payment.changeAmount)}} [[app.settings.monetaryUnit]]</b>
@@ -248,7 +248,7 @@
                   </template>
                 </template>
               </template>
-              
+
 
             </div>
 
diff --git a/client/src/page-view-sales.html b/client/src/page-view-sales.html
index eb82e8698..1e0e60327 100644
--- a/client/src/page-view-sales.html
+++ b/client/src/page-view-sales.html
@@ -120,7 +120,7 @@
       </div>
 
       <template is="dom-if" if="[[$shouldTakeAdditionalPayment(sales.payment.totalBilled,  sales.payment.totalPaidAmount)]]">
-        <elem-additional-payment amount-left-to-pay="[[amountLeftToPay]]" page="[[page]]" customer="[[customer]]">
+        <elem-additional-payment amount-left-to-pay="[[amountLeftToPay]]" page="[[page]]" customer="[[customer]]" is-from-view-sales-page>
           </elem-additional-paymentt>
       </template>
 

From 61bb0b9b24588eb73e0aec8e0696261022f343ac Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Sun, 7 Oct 2018 02:26:14 +0600
Subject: [PATCH 47/74] Updated ElemAdditionalPayment#_calculatePayment

---
 client/src/elem-additional-payment.html | 40 +++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/client/src/elem-additional-payment.html b/client/src/elem-additional-payment.html
index 2afe94145..ccdbe7d5f 100644
--- a/client/src/elem-additional-payment.html
+++ b/client/src/elem-additional-payment.html
@@ -38,6 +38,11 @@
       .full-width-paper-dropdown {
         width: 100%;
       }
+
+      .should-save-change{
+        margin-top: 12px;
+        margin-bottom: 4px;
+      }
     </style>
     <div class="card p-0 vertical layout">
       <div class="list">
@@ -73,7 +78,7 @@
             <br>
             <template is="dom-if" if="[[customer]]">
               <template is="dom-if" if="[[payment.changeAmount]]">
-                <paper-checkbox checked="{{payment.shouldSaveChangeInAccount}}">
+                <paper-checkbox class="should-save-change" checked="{{payment.shouldSaveChangeInAccount}}">
                   [[verses.pos.shouldSaveChangeInAccount]]
                 </paper-checkbox>
               </template>
@@ -85,7 +90,7 @@
         <template is="dom-if" if="[[isFromViewSalesPage]]">
           <!-- TRANSLATE -->
           <div class="horizontal layout m-top-16">
-            <paper-button raised class="primary flex" on-tap="addPaymentTapped">Add Payment</paper-button>
+            <paper-button raised class="primary flex" on-tap="addPaymentTapped">Add Additional Payment</paper-button>
           </div>
         </template>
 
@@ -130,14 +135,43 @@
         if (!this.page) return;
       }
 
+      _calculatePayment() {
+        let {
+          paymentMethod,
+          paidAmount,
+          changeAmount,
+          shouldSaveChangeInAccount
+        } = this.payment;
+        let amountLeftToPay = parseFloat(this.amountLeftToPay);
+        paidAmount = parseFloat(paidAmount);
+        changeAmount = parseFloat(changeAmount);
+        if (paymentMethod === 'change-wallet') {
+          changeAmount = 0;
+        } else {
+          if (paidAmount > amountLeftToPay) {
+            changeAmount = paidAmount - amountLeftToPay;
+          }
+        }
+        this.payment = {
+          paymentMethod,
+          paidAmount,
+          changeAmount,
+          shouldSaveChangeInAccount
+        };
+      }
+
       paymentMethodSelected(e) {
         // NOTE: The timeout should not be necessary. However, without it
         // the value of this.payment.paymentMethod is not being updated in time.
         window.setTimeout(() => {
-          // this._calculatePayment();
+          this._calculatePayment();
         }, 100);
       }
 
+      genericPaymentInputChanged(e) {
+        this._calculatePayment();
+      }
+
       isPaymentMethodChangeWallet(paymentMethod) {
         return (paymentMethod === 'change-wallet');
       }

From 309f24d491ea068f0a7799788e3f0b59d6563d17 Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Sun, 7 Oct 2018 11:50:40 +0600
Subject: [PATCH 48/74] Added _processAddPayment

---
 client/src/elem-additional-payment.html | 26 +++++++++++++++++++++++++
 client/src/page-view-sales.html         |  4 ++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/client/src/elem-additional-payment.html b/client/src/elem-additional-payment.html
index ccdbe7d5f..0e62ce236 100644
--- a/client/src/elem-additional-payment.html
+++ b/client/src/elem-additional-payment.html
@@ -176,6 +176,32 @@
         return (paymentMethod === 'change-wallet');
       }
 
+      addPaymentTapped(e) {
+        let salesId = parseInt(this.page.params.sales);
+        this._processAddPayment(salesId);
+      }
+
+      _processAddPayment(salesId) {
+        this._calculatePayment();
+        let customerId = this.customerId;
+        let payment = this.payment;
+        let data = { customerId, salesId, payment };
+        this.page.app.callAddAdditionalPaymentApi(data, (err, response) => {
+          if (err) return;
+          if (response.hasError) return this.onApiError(response.error);
+          // TRANSLATE
+          let message = "You are adding an additional payment to this sale. Proceed?";
+          this.app.showToast(message, _ => {
+            this._resetAdditionalPayment();
+          });
+        });
+      }
+
+      _resetAdditionalPayment() {
+        this.resetProperties('payment', 'customer');
+        this.app.refreshCurrentPage();
+      }
+
     }
     window.customElements.define(ElemAdditionalPayment.is, ElemAdditionalPayment);
   </script>
diff --git a/client/src/page-view-sales.html b/client/src/page-view-sales.html
index 1e0e60327..066a9dc6e 100644
--- a/client/src/page-view-sales.html
+++ b/client/src/page-view-sales.html
@@ -116,11 +116,10 @@
             <div class="dated">[[verses.general.dated]]: [[$mkDate(payment.createdDatetimeStamp, 'hh:mmtt dd-MM-yyyy')]]</div>
           </div>
         </template>
-
       </div>
 
       <template is="dom-if" if="[[$shouldTakeAdditionalPayment(sales.payment.totalBilled,  sales.payment.totalPaidAmount)]]">
-        <elem-additional-payment amount-left-to-pay="[[amountLeftToPay]]" page="[[page]]" customer="[[customer]]" is-from-view-sales-page>
+        <elem-additional-payment amount-left-to-pay="[[amountLeftToPay]]" page="[[self]]" customer="[[customer]]" is-from-view-sales-page>
           </elem-additional-paymentt>
       </template>
 
@@ -155,6 +154,7 @@
       }
 
       onNavigateIn() {
+        this.self = this;
         this.app.shouldShowSaveButton = false;
         this.app.currentPageIsModal = true;
         this.useLanguageServices();

From 250ee7ab1ea98824a370bcf9d02e4b242362b9dc Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Sun, 7 Oct 2018 12:30:42 +0600
Subject: [PATCH 49/74] Fixed SalesCollection#findById

---
 server/src/apis/add-sales-return.js    | 3 ++-
 server/src/apis/mixins/sales-common.js | 4 ++--
 server/src/collections/sales.js        | 4 ----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/server/src/apis/add-sales-return.js b/server/src/apis/add-sales-return.js
index a15242085..4c61f0508 100644
--- a/server/src/apis/add-sales-return.js
+++ b/server/src/apis/add-sales-return.js
@@ -53,7 +53,8 @@ exports.AddSalesReturnApi = class extends Api.mixin(InventoryMixin, CustomerMixi
   async handle({ body }) {
     let { salesId, returnedProductList, creditedAmount, shouldSaveReturnableInChangeWallet } = body;
 
-    let sales = await this.database.sales.findById({ salesId });
+    let sales = await this.database.sales.findById({ id: salesId });
+    // verify sales exists 
     // _verifyProductsExist in returnedProductList
     // _verifyProductsAreReturnable in returnedProductList
     let outletReturnedInventory = await this.__getOutletReturnedInventory({ outletId: salesId.outletId });
diff --git a/server/src/apis/mixins/sales-common.js b/server/src/apis/mixins/sales-common.js
index 63ae0391e..c8f8e22c0 100644
--- a/server/src/apis/mixins/sales-common.js
+++ b/server/src/apis/mixins/sales-common.js
@@ -3,7 +3,7 @@ const { throwOnFalsy, throwOnTruthy, CodedError } = require('./../../utils/coded
 exports.salesCommonMixin = (SuperApiClass) => class extends SuperApiClass {
 
   async _getSales({ salesId }) {
-    let sales = await this.database.sales.findById({ salesId });
+    let sales = await this.database.sales.findById({ id: salesId });
     throwOnFalsy(sales, "SALES_INVALID", "Sales not found");
     return sales;
   }
@@ -14,5 +14,5 @@ exports.salesCommonMixin = (SuperApiClass) => class extends SuperApiClass {
     let salesList = await this.database.sales.listByFilters({ outletIdList, outletId, customerId, shouldFilterByOutlet, shouldFilterByCustomer, fromDate, toDate });
     return salesList;
   }
-  
+
 }
\ No newline at end of file
diff --git a/server/src/collections/sales.js b/server/src/collections/sales.js
index 9874c7923..1be45124f 100644
--- a/server/src/collections/sales.js
+++ b/server/src/collections/sales.js
@@ -147,8 +147,4 @@ exports.SalesCollection = class extends Collection {
     return await this._find(query);
   }
 
-  async findById({ salesId }) {
-    return await this._findOne({ id: salesId });
-  }
-
 }
\ No newline at end of file

From d0fb3354db275374fab021927da4a93a7c5ae55d Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Sun, 7 Oct 2018 12:41:15 +0600
Subject: [PATCH 50/74] Added AddAdditionalSalesApi (Work in Progress)

---
 server/src/apis/add-additional-payment.js | 106 ++++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 server/src/apis/add-additional-payment.js

diff --git a/server/src/apis/add-additional-payment.js b/server/src/apis/add-additional-payment.js
new file mode 100644
index 000000000..88ccc5232
--- /dev/null
+++ b/server/src/apis/add-additional-payment.js
@@ -0,0 +1,106 @@
+const { Api } = require('./../api-base');
+const Joi = require('joi');
+const { throwOnFalsy, throwOnTruthy, CodedError } = require('./../utils/coded-error');
+const { extract } = require('./../utils/extract');
+const { InventoryMixin } = require('./mixins/inventory-mixin');
+const { CustomerMixin } = require('./mixins/customer-mixin');
+
+exports.AddAdditionalSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
+
+  get autoValidates() { return true; }
+
+  get requiresAuthentication() { return true; }
+
+  get requestSchema() {
+    return Joi.object().keys({
+      salesId: Joi.number().max(999999999999999).required(),
+      customerId: Joi.number().max(999999999999999).required(),
+      payment: Joi.object().keys({
+        paymentMethod: Joi.string().valid('cash', 'card', 'digital', 'change-wallet').required(),
+        paidAmount: Joi.number().max(999999999999999).required(),
+        changeAmount: Joi.number().max(999999999999999).required(),
+        shouldSaveChangeInAccount: Joi.boolean().required()
+      })
+    });
+  }
+
+  get accessControl() {
+    return [{
+      organizationBy: [
+        {
+          from: "sales",
+          query: ({ salesId }) => ({ id: salesId }),
+          select: "outletId",
+          errorCode: "SALES_INVALID"
+        },
+        {
+          from: "outlet",
+          query: ({ outletId }) => ({ id: outletId }),
+          select: "organizationId"
+        }
+      ],
+      privileges: [
+        "PRIV_ACCESS_POS"
+      ]
+    }];
+  }
+
+  async _processASinglePayment({ userId, payment, customer, newPayment }) {
+    // NOTE: At this point, all of above fields are validated and completely trustworthy.
+
+    // NOTE: since paidAmount includes changeAmount, we confirmed after discussion.
+    let paidAmountWithoutChange = (newPayment.paidAmount - newPayment.changeAmount);
+
+    if (newPayment.paymentMethod === 'change-wallet') {
+      await this._deductFromChangeWalletAsPayment({ customer, amount: paidAmountWithoutChange });
+    }
+
+    payment.totalPaidAmount += paidAmountWithoutChange;
+    let wasChangeSavedInChangeWallet = false;
+    if (newPayment.changeAmount && newPayment.shouldSaveChangeInAccount) {
+      wasChangeSavedInChangeWallet = true;
+      await this._addChangeToChangeWallet({ customer, amount: newPayment.changeAmount });
+    }
+
+    let {
+      createdDatetimeStamp, acceptedByUserId, paymentMethod, paidAmount, changeAmount
+    } = newPayment;
+    payment.paymentList.push({
+      createdDatetimeStamp, acceptedByUserId, paymentMethod, paidAmount, changeAmount,
+      wasChangeSavedInChangeWallet
+    });
+
+    return payment;
+
+  }
+
+  async _getCustomer({ customerId }) {
+    let customer = await this.database.customer.findById({ id: customerId });
+    throwOnFalsy(customer, "CUSTOMER_INVALID", "Customer not found.");
+    return customer;
+  }
+
+  async _getSales({ salesId }) {
+    let sales = await this.database.sales.findById({ id: salesId });
+    throwOnFalsy(sales, "SALES_INVALID", "Sales not found");
+    return sales;
+  }
+
+  async _validateBillingAndPayment({ payment, newPayment, customer }) {
+    if (payment.totalBilled > (payment.totalPaidAmount + newPayment.paidAmount)) {
+      throwOnFalsy(customer, "CREDIT_SALE_NOT_ALLOWED_WITHOUT_CUSTOMER", "Credit sale is not allowed without a registered cutomer.");
+    }
+    return;
+  }
+
+  async handle({ userId, body }) {
+    let { salesId, customerId, payment: newPayment } = body;
+    let sales = this._getSales({ salesId });
+    let customer = await this._getCustomer({ customerId });
+    let payment = sales.payment;
+    await this._validateBillingAndPayment({ payment, newPayment, customer });
+    payment = await this._processASinglePayment({ userId, customer, payment, newPayment });
+    return { status: "success" };
+  }
+
+}
\ No newline at end of file

From 91a862081e149209a2a7b8fcbc4ca596e6b9e50d Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Sun, 7 Oct 2018 12:59:20 +0600
Subject: [PATCH 51/74] Updated _standardizePayment and _processASinglePayment

---
 server/src/apis/add-additional-payment.js | 25 ++++++++++++++++-------
 server/src/apis/add-sales.js              | 14 ++++++-------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/server/src/apis/add-additional-payment.js b/server/src/apis/add-additional-payment.js
index 88ccc5232..f8273d256 100644
--- a/server/src/apis/add-additional-payment.js
+++ b/server/src/apis/add-additional-payment.js
@@ -63,15 +63,17 @@ exports.AddAdditionalSalesApi = class extends Api.mixin(InventoryMixin, Customer
     }
 
     let {
-      createdDatetimeStamp, acceptedByUserId, paymentMethod, paidAmount, changeAmount
+      paymentMethod, paidAmount, changeAmount
     } = newPayment;
+
     payment.paymentList.push({
-      createdDatetimeStamp, acceptedByUserId, paymentMethod, paidAmount, changeAmount,
+      createdDatetimeStamp: Date.now(),
+      acceptedByUserId: userId,
+      paymentMethod, paidAmount, changeAmount,
       wasChangeSavedInChangeWallet
     });
 
     return payment;
-
   }
 
   async _getCustomer({ customerId }) {
@@ -86,11 +88,20 @@ exports.AddAdditionalSalesApi = class extends Api.mixin(InventoryMixin, Customer
     return sales;
   }
 
-  async _validateBillingAndPayment({ payment, newPayment, customer }) {
+  async _validateNewPayment({ payment, newPayment, customer }) {
     if (payment.totalBilled > (payment.totalPaidAmount + newPayment.paidAmount)) {
-      throwOnFalsy(customer, "CREDIT_SALE_NOT_ALLOWED_WITHOUT_CUSTOMER", "Credit sale is not allowed without a registered cutomer.");
+      if (newPayment.changeAmount !== 0) {
+        throw new CodedError("INCORRECT_PAYMENT_CALCULATION", "Non-zero change amount.");
+      }
+    } else {
+      let calculatedChangeAmount = (payment.totalPaidAmount + newPayment.paidAmount) - payment.totalBilled;
+      if (calculatedChangeAmount !== newPayment.changeAmount) {
+        throw new CodedError("INCORRECT_PAYMENT_CALCULATION", "Change calculation not accurate.");
+      }
+    }
+    if (newPayment.paymentMethod === 'change-wallet' && customer.changeWalletBalance < newPayment.paidAmount) {
+      throw new CodedError("CUSTOMER_HAS_INSUFFICIENT_BALANCE_IN_CHANGE_WALLET", "The customer does not have enough balance in change wallet.");
     }
-    return;
   }
 
   async handle({ userId, body }) {
@@ -98,7 +109,7 @@ exports.AddAdditionalSalesApi = class extends Api.mixin(InventoryMixin, Customer
     let sales = this._getSales({ salesId });
     let customer = await this._getCustomer({ customerId });
     let payment = sales.payment;
-    await this._validateBillingAndPayment({ payment, newPayment, customer });
+    await this._validateNewPayment({ payment, newPayment, customer });
     payment = await this._processASinglePayment({ userId, customer, payment, newPayment });
     return { status: "success" };
   }
diff --git a/server/src/apis/add-sales.js b/server/src/apis/add-sales.js
index e0ec7e463..2817bf974 100644
--- a/server/src/apis/add-sales.js
+++ b/server/src/apis/add-sales.js
@@ -95,7 +95,7 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
         by customer.
       see the signature of the objects returned for more clarification.
   */
-  _standardizePayment({ originalPayment, userId }) {
+  _standardizePayment({ originalPayment }) {
     let {
       totalAmount, vatAmount, discountType, discountValue, discountedAmount, serviceChargeAmount,
       totalBilled,
@@ -109,8 +109,6 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
     }
 
     let newPayment = {
-      createdDatetimeStamp: Date.now(),
-      acceptedByUserId: userId,
       paymentMethod, paidAmount, changeAmount, shouldSaveChangeInAccount
     }
 
@@ -136,15 +134,17 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
     }
 
     let {
-      createdDatetimeStamp, acceptedByUserId, paymentMethod, paidAmount, changeAmount
+      paymentMethod, paidAmount, changeAmount
     } = newPayment;
+
     payment.paymentList.push({
-      createdDatetimeStamp, acceptedByUserId, paymentMethod, paidAmount, changeAmount,
+      createdDatetimeStamp: Date.now(),
+      acceptedByUserId: userId,
+      paymentMethod, paidAmount, changeAmount,
       wasChangeSavedInChangeWallet
     });
 
     return payment;
-
   }
 
   async _findCustomerIfSelected({ customerId }) {
@@ -166,7 +166,7 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
     let outletDefaultInventory = await this.__getOutletDefaultInventory({ outletId });
     this._reduceProductCountFromOutletDefaultInventory({ outletDefaultInventory, productList });
 
-    let { payment, newPayment } = this._standardizePayment({ originalPayment, userId });
+    let { payment, newPayment } = this._standardizePayment({ originalPayment });
     await this._validateBillingAndPayment({ productList, payment, newPayment, customer });
     payment = await this._processASinglePayment({ userId, customer, payment, newPayment });
 

From fbc8c4352dc1f160342f8f51b96c2160c25c2b61 Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Sun, 7 Oct 2018 13:05:56 +0600
Subject: [PATCH 52/74] Updated SalesMixin

---
 server/src/apis/add-additional-payment.js                | 9 ++-------
 server/src/apis/add-sales.js                             | 3 ++-
 server/src/apis/get-dashboard-summary.js                 | 4 ++--
 .../src/apis/mixins/{sales-common.js => sales-mixin.js}  | 4 +++-
 4 files changed, 9 insertions(+), 11 deletions(-)
 rename server/src/apis/mixins/{sales-common.js => sales-mixin.js} (90%)

diff --git a/server/src/apis/add-additional-payment.js b/server/src/apis/add-additional-payment.js
index f8273d256..168d35e75 100644
--- a/server/src/apis/add-additional-payment.js
+++ b/server/src/apis/add-additional-payment.js
@@ -4,8 +4,9 @@ const { throwOnFalsy, throwOnTruthy, CodedError } = require('./../utils/coded-er
 const { extract } = require('./../utils/extract');
 const { InventoryMixin } = require('./mixins/inventory-mixin');
 const { CustomerMixin } = require('./mixins/customer-mixin');
+const { SalesMixin } = require('./mixins/sales-mixin');
 
-exports.AddAdditionalSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
+exports.AddAdditionalSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin, SalesMixin) {
 
   get autoValidates() { return true; }
 
@@ -82,12 +83,6 @@ exports.AddAdditionalSalesApi = class extends Api.mixin(InventoryMixin, Customer
     return customer;
   }
 
-  async _getSales({ salesId }) {
-    let sales = await this.database.sales.findById({ id: salesId });
-    throwOnFalsy(sales, "SALES_INVALID", "Sales not found");
-    return sales;
-  }
-
   async _validateNewPayment({ payment, newPayment, customer }) {
     if (payment.totalBilled > (payment.totalPaidAmount + newPayment.paidAmount)) {
       if (newPayment.changeAmount !== 0) {
diff --git a/server/src/apis/add-sales.js b/server/src/apis/add-sales.js
index 2817bf974..3c50b5bf9 100644
--- a/server/src/apis/add-sales.js
+++ b/server/src/apis/add-sales.js
@@ -4,8 +4,9 @@ const { throwOnFalsy, throwOnTruthy, CodedError } = require('./../utils/coded-er
 const { extract } = require('./../utils/extract');
 const { InventoryMixin } = require('./mixins/inventory-mixin');
 const { CustomerMixin } = require('./mixins/customer-mixin');
+const { SalesMixin } = require('./mixins/sales-mixin');
 
-exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
+exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin, SalesMixin) {
 
   get autoValidates() { return true; }
 
diff --git a/server/src/apis/get-dashboard-summary.js b/server/src/apis/get-dashboard-summary.js
index 2c6a5813b..1c9c14f90 100644
--- a/server/src/apis/get-dashboard-summary.js
+++ b/server/src/apis/get-dashboard-summary.js
@@ -2,9 +2,9 @@ const { Api } = require('./../api-base');
 const Joi = require('joi');
 const { throwOnFalsy, throwOnTruthy, CodedError } = require('./../utils/coded-error');
 
-const { salesCommonMixin } = require('./mixins/sales-common');
+const { SalesMixin } = require('./mixins/sales-mixin');
 
-exports.GetDashboardSummaryApi = class extends Api.mixin(salesCommonMixin) {
+exports.GetDashboardSummaryApi = class extends Api.mixin(SalesMixin) {
 
   get autoValidates() { return true; }
 
diff --git a/server/src/apis/mixins/sales-common.js b/server/src/apis/mixins/sales-mixin.js
similarity index 90%
rename from server/src/apis/mixins/sales-common.js
rename to server/src/apis/mixins/sales-mixin.js
index c8f8e22c0..02bd32660 100644
--- a/server/src/apis/mixins/sales-common.js
+++ b/server/src/apis/mixins/sales-mixin.js
@@ -1,6 +1,6 @@
 const { throwOnFalsy, throwOnTruthy, CodedError } = require('./../../utils/coded-error');
 
-exports.salesCommonMixin = (SuperApiClass) => class extends SuperApiClass {
+exports.SalesMixin = (SuperApiClass) => class extends SuperApiClass {
 
   async _getSales({ salesId }) {
     let sales = await this.database.sales.findById({ id: salesId });
@@ -15,4 +15,6 @@ exports.salesCommonMixin = (SuperApiClass) => class extends SuperApiClass {
     return salesList;
   }
 
+  
+
 }
\ No newline at end of file

From 7d426b52be2bac2776673db73adee95e86865376 Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Sun, 7 Oct 2018 13:10:27 +0600
Subject: [PATCH 53/74] Added AddAdditionalPaymentApi to index and fixed typo

---
 server/src/apis/add-additional-payment.js | 2 +-
 server/src/apis/mixins/sales-mixin.js     | 4 +---
 server/src/index.js                       | 2 ++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/src/apis/add-additional-payment.js b/server/src/apis/add-additional-payment.js
index 168d35e75..75ef3daf6 100644
--- a/server/src/apis/add-additional-payment.js
+++ b/server/src/apis/add-additional-payment.js
@@ -6,7 +6,7 @@ const { InventoryMixin } = require('./mixins/inventory-mixin');
 const { CustomerMixin } = require('./mixins/customer-mixin');
 const { SalesMixin } = require('./mixins/sales-mixin');
 
-exports.AddAdditionalSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin, SalesMixin) {
+exports.AddAdditionalPaymentApi = class extends Api.mixin(InventoryMixin, CustomerMixin, SalesMixin) {
 
   get autoValidates() { return true; }
 
diff --git a/server/src/apis/mixins/sales-mixin.js b/server/src/apis/mixins/sales-mixin.js
index 02bd32660..e3621ba58 100644
--- a/server/src/apis/mixins/sales-mixin.js
+++ b/server/src/apis/mixins/sales-mixin.js
@@ -13,8 +13,6 @@ exports.SalesMixin = (SuperApiClass) => class extends SuperApiClass {
     let outletIdList = outletList.map(outlet => outlet.id);
     let salesList = await this.database.sales.listByFilters({ outletIdList, outletId, customerId, shouldFilterByOutlet, shouldFilterByCustomer, fromDate, toDate });
     return salesList;
-  }
-
-  
+  } 
 
 }
\ No newline at end of file
diff --git a/server/src/index.js b/server/src/index.js
index 3e8315355..69c225aee 100644
--- a/server/src/index.js
+++ b/server/src/index.js
@@ -75,6 +75,7 @@ let { AddProductToInventoryApi } = require('./apis/add-product-to-inventory');
 const { TransferBetweenInventoriesApi } = require('./apis/transfer-between-inventories');
 
 const { AddSalesApi } = require('./apis/add-sales');
+const { AddAdditionalPaymentApi } = require('./apis/add-additional-payment');
 let { GetSalesApi } = require('./legacy-apis/get-sales');
 const { GetSalesListApi } = require('./apis/get-sales-list');
 let { DiscardSalesApi } = require('./legacy-apis/discard-sales');
@@ -295,6 +296,7 @@ class Program {
     server.registerPostApi('/api/get-role-list', GetRoleListApi);
     server.registerPostApi('/api/get-privilege-list', GetPrivilegeListApi);
     server.registerPostApi('/api/add-sales', AddSalesApi);
+    server.registerPostApi('/api/add-additional-payment', AddAdditionalPaymentApi);
     server.registerPostApi('/api/get-sales', GetSalesApi);
     server.registerPostApi('/api/get-sales-list', GetSalesListApi);
     server.registerPostApi('/api/discard-sales', DiscardSalesApi);

From 22acfefb7f9c86497d1ade953588bd888569be90 Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Sun, 7 Oct 2018 13:38:40 +0600
Subject: [PATCH 54/74] Added missing await #426

---
 server/src/apis/user-login.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/apis/user-login.js b/server/src/apis/user-login.js
index fb146b24a..4244cae41 100644
--- a/server/src/apis/user-login.js
+++ b/server/src/apis/user-login.js
@@ -35,7 +35,7 @@ exports.UserLoginApi = class extends Api.mixin(SecurityMixin, UserMixin) {
 
     let warning = [];
     if (emailOrPhone === user.phone && !user.isPhoneVerified) {
-      let phoneVerificationRequest = this.database.phoneVerificationRequest.findByForPhone({ forPhone: user.phone });
+      let phoneVerificationRequest = await this.database.phoneVerificationRequest.findByForPhone({ forPhone: user.phone });
       throwOnFalsy(phoneVerificationRequest, "PHONE_VERIFICATION_REQUEST_NOT_FOUND", this.verses.userLoginApi.phoneVerificationRequestNotFound);
       let { createdDatetimeStamp, isVerificationComplete } = phoneVerificationRequest;
       if (!isVerificationComplete) {
@@ -45,7 +45,7 @@ exports.UserLoginApi = class extends Api.mixin(SecurityMixin, UserMixin) {
         warning.push(`You have less than 1 hour to verify your phone number "${user.phone}".`);
       }
     } else if (emailOrPhone === user.email && !user.isEmailVerified) {
-      let emailVerificationRequest = this.database.emailVerificationRequest.findByForEmail({ forEmail: user.email });
+      let emailVerificationRequest = await this.database.emailVerificationRequest.findByForEmail({ forEmail: user.email });
       throwOnFalsy(emailVerificationRequest, "EMAIL_VERIFICATION_REQUEST_NOT_FOUND", this.verses.userLoginApi.emailVerificationRequestNotFound)
       throwOnFalsy(emailVerificationRequest.isVerificationComplete, "USER_REQUIRES_EMAIL_VERIFICATION", this.verses.userLoginApi.userRequiresEmailVerification)
     } else {

From d090bd1b19c2bcc8f1837b4eec1ba72ca3383979 Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Sun, 7 Oct 2018 14:02:36 +0600
Subject: [PATCH 55/74] Added Api#round()

---
 server/src/api-base.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/src/api-base.js b/server/src/api-base.js
index 545090e40..5f5ef937f 100644
--- a/server/src/api-base.js
+++ b/server/src/api-base.js
@@ -539,6 +539,10 @@ class Api {
     }
   }
 
+  round(number) {
+    return (Math.round(number * 100) / 100);
+  }
+
 }
 
 exports.Api = Api;
\ No newline at end of file

From 35eb1a0c94617072bfa5b2a28b0ab09de8094ff8 Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Sun, 7 Oct 2018 14:09:51 +0600
Subject: [PATCH 56/74] Added test casses for AddAdditionalPaymentApi #418

---
 server/test/test-sales-apis.js | 201 ++++++++++++++++++++++++++++++++-
 1 file changed, 200 insertions(+), 1 deletion(-)

diff --git a/server/test/test-sales-apis.js b/server/test/test-sales-apis.js
index 8878e2a12..12cf6162c 100644
--- a/server/test/test-sales-apis.js
+++ b/server/test/test-sales-apis.js
@@ -128,7 +128,7 @@ describe.only('Sales', _ => {
                   defaultDiscountValue: 10,
                   defaultPurchasePrice: 99,
                   defaultVat: 3,
-                  defaultSalePrice: 111,
+                  defaultSalePrice: 112,
                   isReturnable: true
                 }, (data) => {
                   productCategoryId = data.productCategoryId;
@@ -908,6 +908,205 @@ describe.only('Sales', _ => {
 
   // WithdrawFromChangeWalletBalanceApi tests - end
 
+  // AddAdditionalPayment tests - start
+
+  it('api/add-sales (Valid, Credit Sale With Customer)', testDoneFn => {
+
+    callApi('api/add-sales', {
+      json: {
+        apiKey,
+
+        outletId,
+        customerId,
+
+        productList: [
+          {
+            productId: outletInventoryProductList[0].productId,
+            count: 3,
+            discountType: outletInventoryMatchingProductCategoryList[0].defaultDiscountType,
+            discountValue: outletInventoryMatchingProductCategoryList[0].defaultDiscountValue,
+            salePrice: outletInventoryMatchingProductCategoryList[0].defaultSalePrice
+          }
+        ],
+
+        payment: {
+          totalAmount: (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2),
+          vatAmount: ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100)),
+          discountType: outletInventoryMatchingProductCategoryList[0].defaultDiscountType,
+          discountValue: 0,
+          discountedAmount: ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)),
+          serviceChargeAmount: 0,
+          totalBilled: (outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2 - ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (outletInventoryMatchingProductCategoryList[0].defaultDiscountValue / 100)) + ((outletInventoryMatchingProductCategoryList[0].defaultSalePrice * 2) * (5 / 100))),
+          paidAmount: 30, // out of total billed 212.799999999
+          changeAmount: 0,
+          shouldSaveChangeInAccount: true,
+          paymentMethod: 'cash'
+        }
+      }
+    }, (err, response, body) => {
+      expect(response.statusCode).to.equal(200);
+      validateAddSalesApiSuccessResponse(body);
+
+      salesId = body.salesId;
+      testDoneFn();
+    });
+
+  });
+
+  it('api/add-additional-payment (Valid, cash, Less than total billed)', testDoneFn => {
+
+    callApi('api/add-additional-payment', {
+      json: {
+        apiKey,
+        salesId,
+        customerId,
+        payment: {
+          paidAmount: 20,
+          changeAmount: 0,
+          shouldSaveChangeInAccount: true,
+          paymentMethod: 'cash'
+        }
+      }
+    }, (err, response, body) => {
+      expect(response.statusCode).to.equal(200);
+      validateGenericApiSuccessResponse(body);
+      testDoneFn();
+    });
+
+  });
+
+  it('api/add-additional-payment (Valid, change-wallet, Less than total billed, user has that amount)', testDoneFn => {
+
+    callApi('api/add-additional-payment', {
+      json: {
+        apiKey,
+        salesId,
+        customerId,
+        payment: {
+          paidAmount: 10,
+          changeAmount: 0,
+          shouldSaveChangeInAccount: true,
+          paymentMethod: 'change-wallet'
+        }
+      }
+    }, (err, response, body) => {
+      expect(response.statusCode).to.equal(200);
+      validateGenericApiSuccessResponse(body);
+      testDoneFn();
+    });
+
+  });
+
+  it('api/add-additional-payment (Invalid, change-wallet, Less than total billed, user does not have that amount)', testDoneFn => {
+
+    callApi('api/add-additional-payment', {
+      json: {
+        apiKey,
+        salesId,
+        customerId,
+        payment: {
+          paidAmount: 60,
+          changeAmount: 0,
+          shouldSaveChangeInAccount: true,
+          paymentMethod: 'change-wallet'
+        }
+      }
+    }, (err, response, body) => {
+      expect(response.statusCode).to.equal(200);
+      validateGenericApiFailureResponse(body);
+      expect(body.error.code).to.equal('INSUFFICIENT_BALANCE');
+      testDoneFn();
+    });
+
+  });
+
+  it('api/add-additional-payment (Invalid, cash, incorrect change calculation)', testDoneFn => {
+
+    callApi('api/add-additional-payment', {
+      json: {
+        apiKey,
+        salesId,
+        customerId,
+        payment: {
+          paidAmount: 20,
+          changeAmount: 5,
+          shouldSaveChangeInAccount: true,
+          paymentMethod: 'cash'
+        }
+      }
+    }, (err, response, body) => {
+      expect(response.statusCode).to.equal(200);
+      validateGenericApiFailureResponse(body);
+      expect(body.error.code).to.equal('INCORRECT_PAYMENT_CALCULATION');
+      testDoneFn();
+    });
+
+  });
+
+  let customerRef1 = null;
+  it('api/get-customer (to verify impact of add-additional-payment)', testDoneFn => {
+
+    callApi('api/get-customer', {
+      json: {
+        apiKey,
+        customerId
+      }
+    }, (err, response, body) => {
+      expect(response.statusCode).to.equal(200);
+      validateGetCustomerApiSuccessResponse(body);
+      validateCustomerSchema(body.customer);
+      customerRef1 = body.customer;
+      expect(body.customer).to.have.property('withdrawalHistory').to.have.lengthOf(1);
+
+      testDoneFn();
+    })
+
+  });
+
+  it('api/add-additional-payment (Valid, cash, Greater than remaining)', testDoneFn => {
+
+    callApi('api/add-additional-payment', {
+      json: {
+        apiKey,
+        salesId,
+        customerId,
+        payment: {
+          paidAmount: 200,
+          changeAmount: 47.20,
+          shouldSaveChangeInAccount: true,
+          paymentMethod: 'cash'
+        }
+      }
+    }, (err, response, body) => {
+      expect(response.statusCode).to.equal(200);
+      validateGenericApiSuccessResponse(body);
+      testDoneFn();
+    });
+
+  });
+
+  it('api/get-customer (to verify impact of add-additional-payment)', testDoneFn => {
+
+    callApi('api/get-customer', {
+      json: {
+        apiKey,
+        customerId
+      }
+    }, (err, response, body) => {
+      expect(response.statusCode).to.equal(200);
+      validateGetCustomerApiSuccessResponse(body);
+      validateCustomerSchema(body.customer);
+      let diff = body.customer.changeWalletBalance - customerRef1.changeWalletBalance;
+      diff = Math.round(diff * 100) / 100;
+      expect(diff).to.equal(47.2)
+      testDoneFn();
+    })
+
+  });
+
+
+  // AddAdditionalPayment tests - end
+
   it('END', testDoneFn => {
     terminateServer(testDoneFn);
   });

From 303a12b5db0c92a33dae2ed092640f11026424d7 Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Sun, 7 Oct 2018 14:10:48 +0600
Subject: [PATCH 57/74] Added SalesCollection#setPayment

---
 server/src/collections/sales.js | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/server/src/collections/sales.js b/server/src/collections/sales.js
index 1be45124f..43209438b 100644
--- a/server/src/collections/sales.js
+++ b/server/src/collections/sales.js
@@ -32,17 +32,17 @@ exports.SalesCollection = class extends Collection {
         discountedAmount: Joi.number().max(999999999999999).required(),
         serviceChargeAmount: Joi.number().max(999999999999999).required(),
         totalBilled: Joi.number().max(999999999999999).required(),
-    
+
         totalPaidAmount: Joi.number().max(999999999999999).required(),
         paymentList: Joi.array().required().items(
           Joi.object().keys({
             createdDatetimeStamp: Joi.number().max(999999999999999).required(),
             acceptedByUserId: Joi.number().max(999999999999999).required(),
-    
+
             paidAmount: Joi.number().max(999999999999999).required(),
             changeAmount: Joi.number().max(999999999999999).required(),
             paymentMethod: Joi.string().valid('cash', 'card', 'digital', 'change-wallet').required(),
-            wasChangeSavedInChangeWallet: Joi.boolean().required()   
+            wasChangeSavedInChangeWallet: Joi.boolean().required()
           })
         )
       }),
@@ -93,6 +93,14 @@ exports.SalesCollection = class extends Collection {
     });
   }
 
+  async setPayment({ id }, { payment }) {
+    return await this._update({ id }, {
+      $set: {
+        payment
+      }
+    });
+  }
+
   async discard({ id }) {
     return await this._update({ id }, {
       $push: {
@@ -127,7 +135,7 @@ exports.SalesCollection = class extends Collection {
     return await this._find(query);
   }
 
-  async listByFiltersForSalesReturn({outletIdList, outletId, customerId, shouldFilterByOutlet, shouldFilterByCustomer }) {
+  async listByFiltersForSalesReturn({ outletIdList, outletId, customerId, shouldFilterByOutlet, shouldFilterByCustomer }) {
     let query = {
       $and: [
         {
@@ -143,7 +151,7 @@ exports.SalesCollection = class extends Collection {
     if (shouldFilterByCustomer) {
       query.$and.push({ customerId });
     }
-    
+
     return await this._find(query);
   }
 

From 0552d4008f4803342b70312c32a9c76c687113ea Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Sun, 7 Oct 2018 14:11:12 +0600
Subject: [PATCH 58/74] Updated AddAdditionalPaymentApi#_validateNewPayment

---
 server/src/apis/add-additional-payment.js | 24 +++++++++++------------
 server/src/apis/mixins/sales-mixin.js     |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/server/src/apis/add-additional-payment.js b/server/src/apis/add-additional-payment.js
index 75ef3daf6..2b5cf9be3 100644
--- a/server/src/apis/add-additional-payment.js
+++ b/server/src/apis/add-additional-payment.js
@@ -84,28 +84,28 @@ exports.AddAdditionalPaymentApi = class extends Api.mixin(InventoryMixin, Custom
   }
 
   async _validateNewPayment({ payment, newPayment, customer }) {
-    if (payment.totalBilled > (payment.totalPaidAmount + newPayment.paidAmount)) {
-      if (newPayment.changeAmount !== 0) {
-        throw new CodedError("INCORRECT_PAYMENT_CALCULATION", "Non-zero change amount.");
-      }
-    } else {
-      let calculatedChangeAmount = (payment.totalPaidAmount + newPayment.paidAmount) - payment.totalBilled;
-      if (calculatedChangeAmount !== newPayment.changeAmount) {
-        throw new CodedError("INCORRECT_PAYMENT_CALCULATION", "Change calculation not accurate.");
-      }
-    }
     if (newPayment.paymentMethod === 'change-wallet' && customer.changeWalletBalance < newPayment.paidAmount) {
-      throw new CodedError("CUSTOMER_HAS_INSUFFICIENT_BALANCE_IN_CHANGE_WALLET", "The customer does not have enough balance in change wallet.");
+      // throw new CodedError("CUSTOMER_HAS_INSUFFICIENT_BALANCE_IN_CHANGE_WALLET", "The customer does not have enough balance in change wallet.");
+      // NOTE: skipping the error throwing here since the error is being thrown by _deductFromChangeWalletAsPayment
+    }
+    let calculatedChangeAmount = Math.max((payment.totalPaidAmount + newPayment.paidAmount) - payment.totalBilled, 0);
+
+    console.log(payment.totalPaidAmount, newPayment.paidAmount, payment.totalBilled, calculatedChangeAmount, newPayment.changeAmount);
+    if (this.round(calculatedChangeAmount) !== this.round(newPayment.changeAmount)) {
+      throw new CodedError("INCORRECT_PAYMENT_CALCULATION", "Change calculation is not accurate.");
     }
   }
 
   async handle({ userId, body }) {
     let { salesId, customerId, payment: newPayment } = body;
-    let sales = this._getSales({ salesId });
+    let sales = await this._getSales({ salesId });
     let customer = await this._getCustomer({ customerId });
     let payment = sales.payment;
+    console.log("BEFORE", payment);
     await this._validateNewPayment({ payment, newPayment, customer });
     payment = await this._processASinglePayment({ userId, customer, payment, newPayment });
+    await this.database.sales.setPayment({ id: salesId }, { payment });
+    console.log("AFTER", payment);
     return { status: "success" };
   }
 
diff --git a/server/src/apis/mixins/sales-mixin.js b/server/src/apis/mixins/sales-mixin.js
index e3621ba58..bd1b9cdbf 100644
--- a/server/src/apis/mixins/sales-mixin.js
+++ b/server/src/apis/mixins/sales-mixin.js
@@ -13,6 +13,6 @@ exports.SalesMixin = (SuperApiClass) => class extends SuperApiClass {
     let outletIdList = outletList.map(outlet => outlet.id);
     let salesList = await this.database.sales.listByFilters({ outletIdList, outletId, customerId, shouldFilterByOutlet, shouldFilterByCustomer, fromDate, toDate });
     return salesList;
-  } 
+  }
 
 }
\ No newline at end of file

From de518d5357aad51b2da82b9df39908e6980be26c Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Sun, 7 Oct 2018 14:14:06 +0600
Subject: [PATCH 59/74] Cleaned up #418

---
 server/src/apis/add-additional-payment.js | 36 +----------------------
 server/src/apis/add-sales.js              | 32 --------------------
 server/src/apis/mixins/sales-mixin.js     | 31 +++++++++++++++++++
 3 files changed, 32 insertions(+), 67 deletions(-)

diff --git a/server/src/apis/add-additional-payment.js b/server/src/apis/add-additional-payment.js
index 2b5cf9be3..e8001739d 100644
--- a/server/src/apis/add-additional-payment.js
+++ b/server/src/apis/add-additional-payment.js
@@ -46,37 +46,6 @@ exports.AddAdditionalPaymentApi = class extends Api.mixin(InventoryMixin, Custom
     }];
   }
 
-  async _processASinglePayment({ userId, payment, customer, newPayment }) {
-    // NOTE: At this point, all of above fields are validated and completely trustworthy.
-
-    // NOTE: since paidAmount includes changeAmount, we confirmed after discussion.
-    let paidAmountWithoutChange = (newPayment.paidAmount - newPayment.changeAmount);
-
-    if (newPayment.paymentMethod === 'change-wallet') {
-      await this._deductFromChangeWalletAsPayment({ customer, amount: paidAmountWithoutChange });
-    }
-
-    payment.totalPaidAmount += paidAmountWithoutChange;
-    let wasChangeSavedInChangeWallet = false;
-    if (newPayment.changeAmount && newPayment.shouldSaveChangeInAccount) {
-      wasChangeSavedInChangeWallet = true;
-      await this._addChangeToChangeWallet({ customer, amount: newPayment.changeAmount });
-    }
-
-    let {
-      paymentMethod, paidAmount, changeAmount
-    } = newPayment;
-
-    payment.paymentList.push({
-      createdDatetimeStamp: Date.now(),
-      acceptedByUserId: userId,
-      paymentMethod, paidAmount, changeAmount,
-      wasChangeSavedInChangeWallet
-    });
-
-    return payment;
-  }
-
   async _getCustomer({ customerId }) {
     let customer = await this.database.customer.findById({ id: customerId });
     throwOnFalsy(customer, "CUSTOMER_INVALID", "Customer not found.");
@@ -89,8 +58,6 @@ exports.AddAdditionalPaymentApi = class extends Api.mixin(InventoryMixin, Custom
       // NOTE: skipping the error throwing here since the error is being thrown by _deductFromChangeWalletAsPayment
     }
     let calculatedChangeAmount = Math.max((payment.totalPaidAmount + newPayment.paidAmount) - payment.totalBilled, 0);
-
-    console.log(payment.totalPaidAmount, newPayment.paidAmount, payment.totalBilled, calculatedChangeAmount, newPayment.changeAmount);
     if (this.round(calculatedChangeAmount) !== this.round(newPayment.changeAmount)) {
       throw new CodedError("INCORRECT_PAYMENT_CALCULATION", "Change calculation is not accurate.");
     }
@@ -101,11 +68,10 @@ exports.AddAdditionalPaymentApi = class extends Api.mixin(InventoryMixin, Custom
     let sales = await this._getSales({ salesId });
     let customer = await this._getCustomer({ customerId });
     let payment = sales.payment;
-    console.log("BEFORE", payment);
+
     await this._validateNewPayment({ payment, newPayment, customer });
     payment = await this._processASinglePayment({ userId, customer, payment, newPayment });
     await this.database.sales.setPayment({ id: salesId }, { payment });
-    console.log("AFTER", payment);
     return { status: "success" };
   }
 
diff --git a/server/src/apis/add-sales.js b/server/src/apis/add-sales.js
index 3c50b5bf9..9b9f6e9d8 100644
--- a/server/src/apis/add-sales.js
+++ b/server/src/apis/add-sales.js
@@ -116,38 +116,6 @@ exports.AddSalesApi = class extends Api.mixin(InventoryMixin, CustomerMixin, Sal
     return { payment, newPayment };
   }
 
-
-  async _processASinglePayment({ userId, payment, customer, newPayment }) {
-    // NOTE: At this point, all of above fields are validated and completely trustworthy.
-
-    // NOTE: since paidAmount includes changeAmount, we confirmed after discussion.
-    let paidAmountWithoutChange = (newPayment.paidAmount - newPayment.changeAmount);
-
-    if (newPayment.paymentMethod === 'change-wallet') {
-      await this._deductFromChangeWalletAsPayment({ customer, amount: paidAmountWithoutChange });
-    }
-
-    payment.totalPaidAmount += paidAmountWithoutChange;
-    let wasChangeSavedInChangeWallet = false;
-    if (newPayment.changeAmount && newPayment.shouldSaveChangeInAccount) {
-      wasChangeSavedInChangeWallet = true;
-      await this._addChangeToChangeWallet({ customer, amount: newPayment.changeAmount });
-    }
-
-    let {
-      paymentMethod, paidAmount, changeAmount
-    } = newPayment;
-
-    payment.paymentList.push({
-      createdDatetimeStamp: Date.now(),
-      acceptedByUserId: userId,
-      paymentMethod, paidAmount, changeAmount,
-      wasChangeSavedInChangeWallet
-    });
-
-    return payment;
-  }
-
   async _findCustomerIfSelected({ customerId }) {
     let customer = null;
     if (customerId) {
diff --git a/server/src/apis/mixins/sales-mixin.js b/server/src/apis/mixins/sales-mixin.js
index bd1b9cdbf..27b8d5e00 100644
--- a/server/src/apis/mixins/sales-mixin.js
+++ b/server/src/apis/mixins/sales-mixin.js
@@ -15,4 +15,35 @@ exports.SalesMixin = (SuperApiClass) => class extends SuperApiClass {
     return salesList;
   }
 
+  async _processASinglePayment({ userId, payment, customer, newPayment }) {
+    // NOTE: At this point, all of above fields are validated and completely trustworthy.
+
+    // NOTE: since paidAmount includes changeAmount, we confirmed after discussion.
+    let paidAmountWithoutChange = (newPayment.paidAmount - newPayment.changeAmount);
+
+    if (newPayment.paymentMethod === 'change-wallet') {
+      await this._deductFromChangeWalletAsPayment({ customer, amount: paidAmountWithoutChange });
+    }
+
+    payment.totalPaidAmount += paidAmountWithoutChange;
+    let wasChangeSavedInChangeWallet = false;
+    if (newPayment.changeAmount && newPayment.shouldSaveChangeInAccount) {
+      wasChangeSavedInChangeWallet = true;
+      await this._addChangeToChangeWallet({ customer, amount: newPayment.changeAmount });
+    }
+
+    let {
+      paymentMethod, paidAmount, changeAmount
+    } = newPayment;
+
+    payment.paymentList.push({
+      createdDatetimeStamp: Date.now(),
+      acceptedByUserId: userId,
+      paymentMethod, paidAmount, changeAmount,
+      wasChangeSavedInChangeWallet
+    });
+
+    return payment;
+  }
+
 }
\ No newline at end of file

From dcba50289606c8c4baa8e78e736f44b246344de0 Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Sun, 7 Oct 2018 14:25:21 +0600
Subject: [PATCH 60/74] UI behaving as expected #418

---
 client/src/elem-additional-payment.html | 15 ++++++++-------
 client/src/torque-http-behavior.html    |  5 +++++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/client/src/elem-additional-payment.html b/client/src/elem-additional-payment.html
index 0e62ce236..67aa82209 100644
--- a/client/src/elem-additional-payment.html
+++ b/client/src/elem-additional-payment.html
@@ -144,9 +144,10 @@
         } = this.payment;
         let amountLeftToPay = parseFloat(this.amountLeftToPay);
         paidAmount = parseFloat(paidAmount);
-        changeAmount = parseFloat(changeAmount);
+        changeAmount = 0;
         if (paymentMethod === 'change-wallet') {
           changeAmount = 0;
+          paidAmount = amountLeftToPay;
         } else {
           if (paidAmount > amountLeftToPay) {
             changeAmount = paidAmount - amountLeftToPay;
@@ -183,23 +184,23 @@
 
       _processAddPayment(salesId) {
         this._calculatePayment();
-        let customerId = this.customerId;
+        let customerId = this.customer.id;
         let payment = this.payment;
         let data = { customerId, salesId, payment };
         this.page.app.callAddAdditionalPaymentApi(data, (err, response) => {
           if (err) return;
-          if (response.hasError) return this.onApiError(response.error);
+          if (response.hasError) return this.page.onApiError(response.error);
           // TRANSLATE
-          let message = "You are adding an additional payment to this sale. Proceed?";
-          this.app.showToast(message, _ => {
+          let message = "Additional payment has been added.";
+          this.page.app.showToast(message, _ => {
             this._resetAdditionalPayment();
           });
         });
       }
 
       _resetAdditionalPayment() {
-        this.resetProperties('payment', 'customer');
-        this.app.refreshCurrentPage();
+        // this.resetProperties('payment', 'customer');
+        this.page.app.refreshCurrentPage();
       }
 
     }
diff --git a/client/src/torque-http-behavior.html b/client/src/torque-http-behavior.html
index b1ce3f387..221599a59 100644
--- a/client/src/torque-http-behavior.html
+++ b/client/src/torque-http-behavior.html
@@ -451,6 +451,11 @@
         if (!this._applyApiKey(data)) return;
         this.callCombinedJsonApi('bulk-import-product-categories', data, cbfn);
       }
+
+      callAddAdditionalPaymentApi(data, cbfn) {
+        if (!this._applyApiKey(data)) return;
+        this.callCombinedJsonApi('add-additional-payment', data, cbfn);
+      }
     }
 
   })();

From 165dca67fed7690adb79896e3c1cd025e2722042 Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Sun, 7 Oct 2018 14:32:23 +0600
Subject: [PATCH 61/74] Added docs for add-additional-paymen api #418

---
 meta/api-docs/add-additional-payment.md | 60 +++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 meta/api-docs/add-additional-payment.md

diff --git a/meta/api-docs/add-additional-payment.md b/meta/api-docs/add-additional-payment.md
new file mode 100644
index 000000000..92a0d94de
--- /dev/null
+++ b/meta/api-docs/add-additional-payment.md
@@ -0,0 +1,60 @@
+This API handles adding of additional payment against a sale
+
+url: `api/add-additional-payment`
+
+method: `POST`
+
+### request: 
+```js
+{
+  apiKey: Joi.string().length(64).required(),
+
+  salesId: Joi.number().max(999999999999999).required(),
+  customerId: Joi.number().max(999999999999999).required(),
+  payment: Joi.object().keys({
+    paymentMethod: Joi.string().valid('cash', 'card', 'digital', 'change-wallet').required(),
+    paidAmount: Joi.number().max(999999999999999).required(),
+    changeAmount: Joi.number().max(999999999999999).required(),
+    shouldSaveChangeInAccount: Joi.boolean().required()
+  })
+}
+```
+
+### response (on error):
+```js
+{
+  "hasError": true,
+  "error": {
+    code,
+    message
+  }
+}
+```
+
+Possible Error Codes:
+```js
+{ code: VALIDATION_ERROR } // validation error on one of the fields
+{ code: APIKEY_INVALID } // the api key is invalid
+{ code: CUSTOMER_INVALID } // customer could not be found
+{ code: SALES_INVALID } // sale could not be found
+{ code: INCORRECT_PAYMENT_CALCULATION } // payment calculation is incorrect
+
+From "customer-mixin":
+  { code: INSUFFICIENT_BALANCE }
+  { code: NEGATIVE_AMOUNT_GIVEN }
+  { code: UNABLE_TO_UPDATE_CUSTOMER_CHANGE_WALLET_BALANCE }
+```
+
+### response (on success):
+```js
+{
+  "hasError": false,
+  "status": "success",
+  "salesId": Joi.number().max(999999999999999).allow(null).required()
+}
+```
+
+### db changes:
+updates the `sales` and `customer` collection in db.
+
+

From e30e3aca522dfa80f07c7adeb3c636d61732ab1f Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Sun, 7 Oct 2018 14:32:56 +0600
Subject: [PATCH 62/74] Updated docs for add-sales api #407

---
 meta/api-docs/add-sales.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/api-docs/add-sales.md b/meta/api-docs/add-sales.md
index d473369dc..a7b7f6aa1 100644
--- a/meta/api-docs/add-sales.md
+++ b/meta/api-docs/add-sales.md
@@ -59,6 +59,11 @@ Possible Error Codes:
 { code: PRODUCT_INVALID } // product could not be found
 { code: INSUFFICIENT_PRODUCT } // not enough product in inventory
 { code: BILL_INACCURATE } // Bill is mathematically inaccurate
+
+From "customer-mixin":
+  { code: INSUFFICIENT_BALANCE }
+  { code: NEGATIVE_AMOUNT_GIVEN }
+  { code: UNABLE_TO_UPDATE_CUSTOMER_CHANGE_WALLET_BALANCE }
 ```
 
 ### response (on success):

From 66916a3dbc6c286bf193fc740baff2f72f49868a Mon Sep 17 00:00:00 2001
From: Sayem Shafayet <ishafayet@gmail.com>
Date: Sun, 7 Oct 2018 19:10:29 +0600
Subject: [PATCH 63/74] Cleaned up elem-customer-selector and
 elem-outlet-selector and improved style fixing #422

---
 client/src/elem-customer-selector.html | 29 +++++++++++++++----
 client/src/elem-outlet-selector.html   | 39 ++++++++++++++++++--------
 client/src/page-manage-sales.html      |  3 +-
 3 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/client/src/elem-customer-selector.html b/client/src/elem-customer-selector.html
index 83adeefee..77f3c3b01 100644
--- a/client/src/elem-customer-selector.html
+++ b/client/src/elem-customer-selector.html
@@ -78,6 +78,19 @@
 <dom-module id="elem-customer-selector">
   <template>
     <style include="shared-styles">
+      .item {
+        margin-bottom: 4px;
+        padding-bottom: 6px;
+        border-bottom: 1px dashed rgb(192, 198, 214);
+      }
+
+      .item:first-of-type {
+        margin-top: 4px;
+      }
+
+      .item:last-of-type {
+        border: none;
+      }
     </style>
     <div class="card p-0 vertical layout">
 
@@ -85,13 +98,14 @@
         <paper-input class="flex" value="{{searchString}}" required minlength="0" error-message=[[verses.customerSelector.customerNameOrPhoneInputError]] label=[[verses.customerSelector.customerNameOrPhoneInput]] on-keypress="searchFieldKeypressed"></paper-input>
         <paper-icon-button icon="clear" on-tap="cancelTapped"></paper-icon-button>
         <paper-button raised class="primary" on-tap="searchTapped">
-          [[verses.general.search]]
+          <iron-icon icon="search" class="m-right-8"></iron-icon>[[verses.general.search]]
         </paper-button>
       </div>
 
-      <paper-listbox>
+      <div class="vertical layout">
         <template is="dom-repeat" items="[[customerList]]" as="customer" index-as="customerIndex">
-          <paper-item class="custom layout horizontal center">
+          <div class="horizontal layout item center">
+
             <div class="flex">
               <div class="type body capitalize">[[customer.fullName]]</div>
               <div class="horizontal layout wrap type secondary">
@@ -106,9 +120,12 @@
               </div>
             </div>
             <paper-button raised class="primary btn btn-default" on-tap="selectTapped">[[verses.general.select]]</paper-button>
-          </paper-item>
-      </paper-listbox>
-      </template>
+
+
+          </div>
+        </template>
+      </div>
+
     </div>
   </template>
   <script>
diff --git a/client/src/elem-outlet-selector.html b/client/src/elem-outlet-selector.html
index 794ddfcea..32868cc74 100644
--- a/client/src/elem-outlet-selector.html
+++ b/client/src/elem-outlet-selector.html
@@ -75,26 +75,43 @@
 <dom-module id="elem-outlet-selector">
   <template>
     <style include="shared-styles">
+      .item {
+        margin-bottom: 4px;
+        padding-bottom: 6px;
+        border-bottom: 1px dashed rgb(192, 198, 214);
+      }
+
+      .item:first-of-type {
+        margin-top: 4px;
+      }
+
+      .item:last-of-type {
+        border: none;
+      }
     </style>
     <div class="card vertical layout">
       <div class="horizontal layout center">
         <paper-input class="flex" value="{{searchString}}" required minlength="0" error-message=[[verses.outletSelector.outletNameOrPhoneInputError]] label=[[verses.outletSelector.outletNameOrPhoneInput]] on-keypress="searchFieldKeypressed"></paper-input>
         <paper-icon-button icon="clear" on-tap="cancelTapped"></paper-icon-button>
         <paper-button raised class="primary" on-tap="searchTapped">
-          <iron-icon icon="search" class="m-right-8"></iron-icon>[[verses.general.search]]</paper-button>
+          <iron-icon icon="search" class="m-right-8"></iron-icon>[[verses.general.search]]
+        </paper-button>
       </div>
 
-      <template is="dom-repeat" items="[[outletList]]" as="outlet" index-as="outletIndex">
-        <div class="horizontal layout item flex">
-          <div>
-            [[verses.outletSelector.outlets]]:
-            <b>[[outlet.name]]</b> ([[outlet.phone]])
-            <br>[[verses.general.address]]:
-            <b>[[outlet.physicalAddress]]</b>
+      <div class="vertical layout">
+        <template is="dom-repeat" items="[[outletList]]" as="outlet" index-as="outletIndex">
+          <div class="horizontal layout item center">
+            <div class="flex">
+              [[verses.outletSelector.outlets]]:
+              <b>[[outlet.name]]</b> ([[outlet.phone]])
+              <br>[[verses.general.address]]:
+              <b>[[outlet.physicalAddress]]</b>
+            </div>
+            <paper-button raised class="primary" on-tap="selectTapped">[[verses.general.select]]</paper-button>
           </div>
-          <paper-button raised class="primary" on-tap="selectTapped">[[verses.general.select]]</paper-button>
-        </div>
-      </template>
+        </template>
+      </div>
+
     </div>
   </template>
   <script>
diff --git a/client/src/page-manage-sales.html b/client/src/page-manage-sales.html
index e6742f7c4..863fdcf4d 100644
--- a/client/src/page-manage-sales.html
+++ b/client/src/page-manage-sales.html
@@ -92,6 +92,7 @@
           </div>
         </div>
       </template>
+
       <elem-outlet-selector page="{{self}}" class$="[[$if(isSearchingOutlet, '', 'hidden')]]"></elem-outlet-selector>
 
       <paper-button raised class="primary" on-tap="filterTapped">[[verses.general.filter]]</paper-button>
@@ -119,7 +120,7 @@
                   <div class="description-time">[[$mkDate(sale.createdDatetimeStamp, 'hh:mmtt dd-MM-yyyy')]]</div>
                   <div class="description">[[verses.sales.billed]]: [[$round(sale.payment.totalBilled)]] [[app.settings.monetaryUnit]], [[verses.sales.paid]]: [[$round(sale.payment.totalPaidAmount)]] [[app.settings.monetaryUnit]]</div>
                   <div class="description">[[sale.productList.length]] [[verses.sales.products]]</div>
-                
+
                 </div>
                 <paper-button raised class="secondary" on-tap="viewTapped">[[verses.general.view]]</paper-button>
               </div>

From adc9721a5dced48a6ed6b2a51dc67ecf9a4dd857 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Sun, 7 Oct 2018 19:32:07 +0600
Subject: [PATCH 64/74] adjust customer balacne feature removed from client

---
 client/src/page-adjust-customer-balance.html  | 172 ------------------
 client/src/page-view-customer.html            |   9 -
 .../withdraw-from-change-wallet-balance.md    |   4 -
 3 files changed, 185 deletions(-)
 delete mode 100644 client/src/page-adjust-customer-balance.html

diff --git a/client/src/page-adjust-customer-balance.html b/client/src/page-adjust-customer-balance.html
deleted file mode 100644
index 30f4b9c1f..000000000
--- a/client/src/page-adjust-customer-balance.html
+++ /dev/null
@@ -1,172 +0,0 @@
-<link rel="import" href="../bower_components/polymer/polymer-element.html">
-<link rel="import" href="../bower_components/paper-button/paper-button.html">
-<link rel="import" href="../bower_components/paper-input/paper-input.html">
-<link rel="import" href="../bower_components/paper-input/paper-textarea.html">
-<link rel="import" href="../bower_components/paper-tabs/paper-tabs.html">
-<link rel="import" href="../bower_components/paper-tabs/paper-tab.html">
-<link rel="import" href="../bower_components/paper-checkbox/paper-checkbox.html">
-<link rel="import" href="../bower_components/iron-form/iron-form.html">
-
-<link rel="import" href="../bower_components/paper-dropdown-menu/paper-dropdown-menu.html">
-<link rel="import" href="../bower_components/paper-listbox/paper-listbox.html">
-<link rel="import" href="../bower_components/paper-item/paper-item.html">
-
-<link rel="import" href="../bower_components/baselib/baselib.html">
-
-<link rel="import" href="../bower_components/polymer-fx/fx-page.html">
-<link rel="import" href="../bower_components/polymer-fx/fx-common-behavior.html">
-
-<link rel="import" href="torque-db-behavior.html">
-<link rel="import" href="torque-common-behavior.html">
-<link rel="import" href="torque-page-behavior.html">
-<link rel="import" href="torque-language-behavior.html">
-
-<link rel="import" href="shared-styles.html">
-
-
-<dom-module id="page-adjust-customer-balance">
-  <template>
-    <style include="shared-styles">
-
-    </style>
-
-    <elem-not-ready is-ready="[[isReady]]"></elem-not-ready>
-
-    <div class$="page layout vertical [[$if(isReady, '', 'hidden')]]" id="wrapper">
-      <iron-form id="adjustCustomerBalanceForm">
-        <form>
-          <div class="card vertical layout">
-            <paper-dropdown-menu label=[[verses.adjustCustomerBalance.actionSelection]] class="mr-4">
-              <paper-listbox slot="dropdown-content" selected="{{adjustCustomerBalanceForm.action}}" attr-for-selected="name">
-                <paper-item name="payment">[[verses.adjustCustomerBalance.payment]]</paper-item>
-                <paper-item name="withdrawl">[[verses.adjustCustomerBalance.withdrawl]]</paper-item>
-              </paper-listbox>
-            </paper-dropdown-menu>
-            <paper-input class="adjustCustomerBalanceForm--amount" value="{{adjustCustomerBalanceForm.amount}}" type="number" required minlength="1" maxlength="10" error-message=[[verses.adjustCustomerBalance.amountInputError]] label=[[verses.adjustCustomerBalance.amountInput]]></paper-input>
-            <div class="horizontal layout button-row end">
-              <div class="flex"></div>
-              <paper-button raised class="primary" on-tap="adjustCustomerBalanceTapped">[[verses.adjustCustomerBalance.adjust]]</paper-button>
-            </div>
-          </div>
-        </form>
-      </iron-form>
-    </div>
-
-  </template>
-
-  <script>
-    class PageAdjustCustomerBalance extends FxPage.mixin(TorqueCommonBehavior, TorquePageBehavior, TorqueDbBehavior, FxCommonBehavior, TorqueLanguageBehavior) {
-      static get is() {
-        return 'page-adjust-customer-balance';
-      }
-
-      static get properties() {
-        return {
-          editingCustomer: {
-            type: Object,
-            value: null
-          },
-          adjustCustomerBalanceForm: {
-            type: Object,
-            value: _ => {
-              if (mode === 'development') {
-                return {
-                  action: 'payment',
-                  amount: '100'
-                };
-              } else {
-                return {
-                  action: '',
-                  amount: ''
-                };
-              }
-            }
-          }
-        };
-      }
-
-      // region: core =================================
-
-      constructor() {
-        super();
-        this.confirmPageReady();
-      }
-
-      onNavigateIn() {
-        this.app.shouldShowSaveButton = false;
-        this.app.currentPageIsModal = true;
-        this.useLanguageServices();
-        this.app.pushPageTitle(this.app.verses.adjustCustomerBalance.adjustCustomerBalanceTitle);
-        if (!this._ensureAccess()) return;
-        if (!('customer' in this.params)) {
-          let message = this.app.verses.general.pageCannotBeDisplayed;
-          this.app.showModalDialog("Something went wrong!", message, _ => {
-            this.app.navigateTo('/home');
-          });
-          return;
-        }
-        this._processGetCustomer(() => {
-          this.isReady = true;
-        });
-      }
-
-      onNavigateOut() {
-        super.onNavigateOut();
-        this.app.popPageTitle();
-        this.resetProperties('adjustCustomerBalanceForm');
-        this.removeAutoValidation('#adjustCustomerBalanceForm paper-input');
-      }
-
-      _ensureAccess() {
-        return this.accessControl('privileged', ['PRIV_MANAGE_CUSTOMER_DEBT']);
-      }
-
-      // region: editCustomer =================================
-
-      _processGetCustomer(cbfn) {
-        let customerId = parseInt(this.params.customer);
-        let data = {
-          customerId
-        };
-        this.app.callGetCustomerApi(data, (err, response) => {
-          if (err) return;
-          if (response.hasError) return this.onApiError(response.error);
-          this.editingCustomer = response.customer;
-          cbfn();
-        });
-      }
-
-      _processAdjustCustomerBalance({ action, amount }) {
-        let data = {
-          action, amount,
-          customerId: this.editingCustomer.id
-        };
-        this.app.callAdjustCustomerBalanceApi(data, (err, response) => {
-          if (err) return;
-          if (response.hasError) return this.onApiError(response.error, 'adjustCustomerBalanceForm');
-          let message = this.app.verses.adjustCustomerBalance.customerBalanceUpdated;
-          this.app.showToast(message, _ => {
-            this.backButtonOnTopBarPressed();
-          });
-        });
-      }
-
-      // region: ui =================================
-
-      adjustCustomerBalanceTapped(e = null) {
-        this.elemAll('#adjustCustomerBalanceForm paper-input').forEach(el => el.autoValidate = true);
-        if (!this.elem('#adjustCustomerBalanceForm').validate()) return;
-
-        let { action, amount } = this.adjustCustomerBalanceForm;
-        this._processAdjustCustomerBalance({ action, amount });
-      }
-
-      backButtonOnTopBarPressed(e = null) {
-        this.app.navigateToPreviousUrl(`/view-customer/customer:${this.params.customer}`);
-      }
-
-    }
-
-    window.customElements.define(PageAdjustCustomerBalance.is, PageAdjustCustomerBalance);
-  </script>
-</dom-module>
diff --git a/client/src/page-view-customer.html b/client/src/page-view-customer.html
index 2b416e11a..26d329298 100644
--- a/client/src/page-view-customer.html
+++ b/client/src/page-view-customer.html
@@ -84,11 +84,6 @@
         <paper-button raised class="secondary m-0" on-tap="editTapped">[[verses.customer.editCustomer]]</paper-button>
       </div>
 
-      <!-- <div class="card action-button-container">
-        <div class="mb-4">[[verses.customer.clickAdjustCustomersBalance]]</div>
-        <paper-button raised class="secondary m-0" on-tap="adjustCustomerBalanceTapped">[[verses.customer.adjustCustomerBalance]]</paper-button>
-      </div> -->
-
       <!-- <div class="card action-button-container">
         <div class="mb-4">[[verses.customer.clickToDeleteCustomer]]</div>
         <paper-button raised class="danger m-0" on-tap="deleteTapped">[[verses.customer.deleteCustomer]]</paper-button>
@@ -175,10 +170,6 @@
         return this.app.navigateTo(`/edit-customer/customer:${this.customer.id}`);
       }
 
-      adjustCustomerBalanceTapped(e = null) {
-        return this.app.navigateTo(`/adjust-customer-balance/customer:${this.customer.id}`);
-      }
-
       withdrawFromChangeWalletBalanceTapped(e = null) {
         return this.app.navigateTo(`/withdraw-from-change-wallet-balance/customer:${this.customer.id}`);
       }
diff --git a/meta/api-docs/withdraw-from-change-wallet-balance.md b/meta/api-docs/withdraw-from-change-wallet-balance.md
index f1998b24b..780c2dfb4 100644
--- a/meta/api-docs/withdraw-from-change-wallet-balance.md
+++ b/meta/api-docs/withdraw-from-change-wallet-balance.md
@@ -4,10 +4,6 @@ url: `api/withdraw-from-change-wallet-balance`
 
 method: `POST`
 
-# WARNING! API DISABLED!
-
-This API has been disabled.
-
 ### request: 
 ```js
 {

From ac2475b7622fa81644b02901321ad59d41690902 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Sun, 7 Oct 2018 19:34:26 +0600
Subject: [PATCH 65/74] adjust cutomer balance removed from server

---
 meta/api-docs/adjust-customer-balance.md      | 49 ----------
 .../legacy-apis/adjust-customer-balance.js    | 72 ---------------
 server/test/test-customer-apis.js             | 90 -------------------
 server/test/test-sales-apis.js                |  2 +-
 4 files changed, 1 insertion(+), 212 deletions(-)
 delete mode 100644 meta/api-docs/adjust-customer-balance.md
 delete mode 100644 server/src/legacy-apis/adjust-customer-balance.js

diff --git a/meta/api-docs/adjust-customer-balance.md b/meta/api-docs/adjust-customer-balance.md
deleted file mode 100644
index c778ea567..000000000
--- a/meta/api-docs/adjust-customer-balance.md
+++ /dev/null
@@ -1,49 +0,0 @@
-This API handles attempt to update customer balance.
-
-url: `api/adjust-customer-balance`
-
-method: `POST`
-
-# WARNING! API DISABLED!
-
-This API has been disabled.
-
-### request: 
-```js
-{
-  apiKey: Joi.string().length(64).required(),
-  customerId: Joi.number().max(999999999999999).required(),
-
-  action: Joi.string().valid('payment', 'withdrawl').required(), 
-  amount: Joi.number().max(999999999999999).required()
-}
-```
-
-### response (on error):
-```js
-{
-  "hasError": true,
-  "error": {
-    code,
-    message
-  }
-}
-```
-
-Possible Error Codes:
-```js
-{ code: VALIDATION_ERROR } // validation error on one of the fields
-{ code: APIKEY_INVALID } // the api key is invalid
-{ code: CUSTOMER_INVALID } // customer does not exist
-```
-
-### response (on success):
-```js
-{
-  "hasError": false,
-  "status": "success"
-}
-```
-
-### db changes:
-updates the `customer` collection in db.
\ No newline at end of file
diff --git a/server/src/legacy-apis/adjust-customer-balance.js b/server/src/legacy-apis/adjust-customer-balance.js
deleted file mode 100644
index 1a3bf2b4d..000000000
--- a/server/src/legacy-apis/adjust-customer-balance.js
+++ /dev/null
@@ -1,72 +0,0 @@
-let { LegacyApi } = require('./../legacy-api-base');
-let Joi = require('joi');
-
-let { collectionCommonMixin } = require('./mixins/collection-common');
-let { customerCommonMixin } = require('./mixins/customer-common');
-
-exports.AdjustCustomerBalanceApi = class extends collectionCommonMixin(customerCommonMixin(LegacyApi)) {
-
-  get isEnabled() { return false; }
-
-  get autoValidates() { return true; }
-
-  get requiresAuthentication() { return true; }
-
-  get requestSchema() {
-    return Joi.object().keys({
-      // apiKey: Joi.string().length(64).required(),
-
-      customerId: Joi.number().max(999999999999999).required(),
-
-      action: Joi.string().valid('payment', 'withdrawl').required(),
-      amount: Joi.number().max(999999999999999).required()
-    });
-  }
-
-  get accessControl() {
-    return [{
-      organizationBy: {
-        from: "customer",
-        query: ({ customerId }) => ({ id: customerId }),
-        select: "organizationId",
-        errorCode: "CUSTOMER_INVALID"
-      },
-      privileges: [
-        "PRIV_MANAGE_CUSTOMER_DEBT"
-      ]
-    }];
-  }
-
-  // FIXME: This does not need to be async
-  _updateAdditionalPaymentHistoryList({ customer, amount, action, acceptedByUserId }, cbfn) {
-    let paymentRecord = {
-      creditedDatetimeStamp: (new Date).getTime(),
-      acceptedByUserId,
-      amount,
-      action
-    }
-    customer.additionalPaymentHistory.push(paymentRecord);
-    return cbfn(customer);
-  }
-
-  _saveAdjustment({ customer }, cbfn) {
-    this.legacyDatabase.customer.updateBalance({ customerId: customer.id }, { balance: customer.balance, additionalPaymentHistory: customer.additionalPaymentHistory }, (err) => {
-      if (err) return this.fail(err);
-      return cbfn()
-    });
-  }
-
-  handle({ body, userId }) {
-    let { customerId, action, amount } = body;
-    this._getCustomer({ customerId }, (customer) => {
-      this._adjustBalance({ customer, action, amount }, (customer) => {
-        this._updateAdditionalPaymentHistoryList({ customer, amount, action, acceptedByUserId: userId }, (customer) => {
-          this._saveAdjustment({ customer }, () => {
-            this.success({ status: "success" });
-          })
-        })
-      })
-    })
-  }
-
-}
\ No newline at end of file
diff --git a/server/test/test-customer-apis.js b/server/test/test-customer-apis.js
index 565ef2376..792a2ce9a 100644
--- a/server/test/test-customer-apis.js
+++ b/server/test/test-customer-apis.js
@@ -352,96 +352,6 @@ describe('Customer', _ => {
 
   });
 
-  it.skip('api/adjust-customer-balance (Valid Payment): ', testDoneFn => {
-
-    callApi('api/adjust-customer-balance', {
-      json: {
-        apiKey,
-        customerId: firstCustomer.id,
-        action: "payment",
-        amount: 20,
-      }
-    }, (err, response, body) => {
-      expect(response.statusCode).to.equal(200);
-      validateGenericApiSuccessResponse(body);
-      testDoneFn();
-    })
-
-  });
-
-  it.skip('api/adjust-customer-balance (Valid Withdrawl): ', testDoneFn => {
-
-    callApi('api/adjust-customer-balance', {
-      json: {
-        apiKey,
-        customerId: firstCustomer.id,
-        action: "withdrawl",
-        amount: 600,
-      }
-    }, (err, response, body) => {
-      expect(response.statusCode).to.equal(200);
-      validateGenericApiSuccessResponse(body);
-      testDoneFn();
-    })
-
-  });
-
-  it.skip('api/get-customer (Adjusted Balance check): ', testDoneFn => {
-
-    callApi('api/get-customer', {
-      json: {
-        apiKey,
-        customerId: firstCustomer.id
-      }
-    }, (err, response, body) => {
-      expect(response.statusCode).to.equal(200);
-      validateGetCustomerApiSuccessResponse(body);
-      validateCustomerSchema(body.customer);
-
-      expect(body.customer).to.have.property('balance').that.equals(-80);
-      expect(body.customer).to.have.property('additionalPaymentHistory').to.have.lengthOf(3);
-
-      testDoneFn();
-    })
-
-  });
-
-  it.skip('api/adjust-customer-balance (Invalid customerId): ', testDoneFn => {
-
-    callApi('api/adjust-customer-balance', {
-      json: {
-        apiKey,
-        customerId: invalidCustomerId,
-        action: "payment",
-        amount: 20,
-      }
-    }, (err, response, body) => {
-      expect(response.statusCode).to.equal(200);
-      validateGenericApiFailureResponse(body);
-      expect(body.error.code).equals('CUSTOMER_INVALID');
-      testDoneFn();
-    })
-
-  });
-
-  it.skip('api/adjust-customer-balance (Invalid Action): ', testDoneFn => {
-
-    callApi('api/adjust-customer-balance', {
-      json: {
-        apiKey,
-        customerId: firstCustomer.id,
-        action: "invalid",
-        amount: 20,
-      }
-    }, (err, response, body) => {
-      expect(response.statusCode).to.equal(200);
-      validateGenericApiFailureResponse(body);
-      expect(body.error.code).equals('VALIDATION_ERROR');
-      testDoneFn();
-    })
-
-  });
-
   it('api/delete-customer (Confirm that API is disabled): ', testDoneFn => {
 
     callApi('api/delete-customer', {
diff --git a/server/test/test-sales-apis.js b/server/test/test-sales-apis.js
index 12cf6162c..7454ff9ae 100644
--- a/server/test/test-sales-apis.js
+++ b/server/test/test-sales-apis.js
@@ -85,7 +85,7 @@ let fromDate = new Date();
 fromDate.setDate(fromDate.getDate() - 1);
 fromDate = fromDate.getTime();
 
-describe.only('Sales', _ => {
+describe('Sales', _ => {
 
   it('START', testDoneFn => {
     initializeServer(_ => {

From aa6bd1760c9776535b5d1dd1475b0d5a7ff60376 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Sun, 7 Oct 2018 20:14:50 +0600
Subject: [PATCH 66/74] _verifyProductsExist added to AddSalesReturnApi

---
 server/src/apis/add-product-to-inventory.js   | 12 ++------
 server/src/apis/add-sales-return.js           |  7 +++--
 ...zation-common.js => organization-mixin.js} |  2 +-
 .../src/apis/mixins/product-category-mixin.js |  9 ++++++
 server/src/apis/mixins/product-mixin.js       | 30 +++++++++++++++++++
 server/test/test-sales-return-apis.js         |  3 +-
 6 files changed, 48 insertions(+), 15 deletions(-)
 rename server/src/apis/mixins/{organization-common.js => organization-mixin.js} (69%)
 create mode 100644 server/src/apis/mixins/product-mixin.js

diff --git a/server/src/apis/add-product-to-inventory.js b/server/src/apis/add-product-to-inventory.js
index f71353f84..3fe6ac5b7 100644
--- a/server/src/apis/add-product-to-inventory.js
+++ b/server/src/apis/add-product-to-inventory.js
@@ -3,8 +3,9 @@ const { Api } = require('./../api-base');
 const Joi = require('joi');
 const { throwOnFalsy, throwOnTruthy, CodedError } = require('./../utils/coded-error');
 const { extract } = require('./../utils/extract');
+const { ProductCategoryMixin } = require('./mixins/product-category-mixin');
 
-exports.AddProductToInventoryApi = class extends Api {
+exports.AddProductToInventoryApi = class extends Api.mixin(ProductCategoryMixin) {
 
   get autoValidates() { return true; }
 
@@ -38,15 +39,6 @@ exports.AddProductToInventoryApi = class extends Api {
     }];
   }
 
-  async _verifyProductCategoriesExist({ productList }) {
-    await this.crossmap({
-      source: productList,
-      sourceKey: 'productCategoryId',
-      target: 'productCategory',
-      onError: (inventory) => { throw new CodedError("PRODUCT_CATEGORY_INVALID", "Unable to find all products in productList"); }
-    });
-  }
-
   async _addProductToInventory({ inventoryId, productList }) {
     let insertedProductList = [];
     await Promise.all(productList.map(async product => {
diff --git a/server/src/apis/add-sales-return.js b/server/src/apis/add-sales-return.js
index 4c61f0508..73fe95b2f 100644
--- a/server/src/apis/add-sales-return.js
+++ b/server/src/apis/add-sales-return.js
@@ -4,8 +4,9 @@ const { throwOnFalsy, throwOnTruthy, CodedError } = require('./../utils/coded-er
 const { extract } = require('./../utils/extract');
 const { InventoryMixin } = require('./mixins/inventory-mixin');
 const { CustomerMixin } = require('./mixins/customer-mixin');
+const { ProductMixin } = require('./mixins/product-mixin');
 
-exports.AddSalesReturnApi = class extends Api.mixin(InventoryMixin, CustomerMixin) {
+exports.AddSalesReturnApi = class extends Api.mixin(InventoryMixin, CustomerMixin, ProductMixin) {
 
   get autoValidates() { return true; }
 
@@ -54,8 +55,8 @@ exports.AddSalesReturnApi = class extends Api.mixin(InventoryMixin, CustomerMixi
     let { salesId, returnedProductList, creditedAmount, shouldSaveReturnableInChangeWallet } = body;
 
     let sales = await this.database.sales.findById({ id: salesId });
-    // verify sales exists 
-    // _verifyProductsExist in returnedProductList
+
+    await this._verifyProductsExist({ productList: returnedProductList });
     // _verifyProductsAreReturnable in returnedProductList
     let outletReturnedInventory = await this.__getOutletReturnedInventory({ outletId: salesId.outletId });
     
diff --git a/server/src/apis/mixins/organization-common.js b/server/src/apis/mixins/organization-mixin.js
similarity index 69%
rename from server/src/apis/mixins/organization-common.js
rename to server/src/apis/mixins/organization-mixin.js
index 61be9c100..ba563dfb2 100644
--- a/server/src/apis/mixins/organization-common.js
+++ b/server/src/apis/mixins/organization-mixin.js
@@ -1,4 +1,4 @@
-exports.OrganizationCommonMixin = (SuperApiClass) => class extends SuperApiClass {
+exports.OrganizationMixin = (SuperApiClass) => class extends SuperApiClass {
 
   async _findOrganizationByEmailOrPhone({ emailOrPhone }) {
     let organization = await this.database.organization.findByEmailOrPhone({ emailOrPhone });
diff --git a/server/src/apis/mixins/product-category-mixin.js b/server/src/apis/mixins/product-category-mixin.js
index 17f7f7fce..fa6935c31 100644
--- a/server/src/apis/mixins/product-category-mixin.js
+++ b/server/src/apis/mixins/product-category-mixin.js
@@ -16,4 +16,13 @@ exports.ProductCategoryMixin = (SuperApiClass) => class extends SuperApiClass {
     }
   }
 
+  async _verifyProductCategoriesExist({ productList }) {
+    await this.crossmap({
+      source: productList,
+      sourceKey: 'productCategoryId',
+      target: 'productCategory',
+      onError: (inventory) => { throw new CodedError("PRODUCT_CATEGORY_INVALID", "Unable to find all products in productList"); }
+    });
+  }
+
 }
\ No newline at end of file
diff --git a/server/src/apis/mixins/product-mixin.js b/server/src/apis/mixins/product-mixin.js
new file mode 100644
index 000000000..35359b114
--- /dev/null
+++ b/server/src/apis/mixins/product-mixin.js
@@ -0,0 +1,30 @@
+const { throwOnFalsy, throwOnTruthy, CodedError } = require('./../../utils/coded-error');
+
+exports.ProductMixin = (SuperApiClass) => class extends SuperApiClass {
+
+  async _verifyProductsExist({ productList }) {
+    let productIdList = productList.map(product => product.productId);
+    let newProductList = await this.database.product.listByIdList({ idList: productIdList });
+    throwOnFalsy(newProductList.length, "PRODUCT_INVALID", "Unable to find all products in productList")
+    return;
+  }
+
+  _verifyProductsAreReturnable({ productList }, cbfn) {
+    let productIdList = productList.map(product => product.productId);
+    this.legacyDatabase.product.findByIdList({ idList: productIdList }, (err, _productList) => {
+      let productCategoryIdList = _productList.map(product => product.productCategoryId);
+      this.legacyDatabase.productCategory.listByIdList({ idList: productCategoryIdList }, (err, productCategoryList) => {
+        if (err) return this.fail(err);
+        for (let productCategory of productCategoryList) {
+          if (productCategory.isReturnable == false) {
+            err = new Error("product in list is non-returnable");
+            err.code = "PRODUCT_CATEGORY_NON_RETURNABLE";
+            return this.fail(err);
+          }
+        }
+        return cbfn();
+      });
+    });
+  }
+
+}
\ No newline at end of file
diff --git a/server/test/test-sales-return-apis.js b/server/test/test-sales-return-apis.js
index 241fc859f..1c0b13bcf 100644
--- a/server/test/test-sales-return-apis.js
+++ b/server/test/test-sales-return-apis.js
@@ -87,7 +87,7 @@ let fromDate = new Date();
 fromDate.setDate(fromDate.getDate() - 1);
 fromDate = fromDate.getTime();
 
-describe('Sales Return', _ => {
+describe.only('Sales Return', _ => {
 
   it('START', testDoneFn => {
     initializeServer(_ => {
@@ -302,6 +302,7 @@ describe('Sales Return', _ => {
         shouldSaveReturnableInChangeWallet: false
       }
     }, (err, response, body) => {
+      console.log(body);
       expect(response.statusCode).to.equal(200);
       validateGenericApiFailureResponse(body);
       expect(body.error.code).equal('PRODUCT_INVALID');

From eb228802903ce151575ba903c13323118a28e454 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Sun, 7 Oct 2018 20:22:45 +0600
Subject: [PATCH 67/74] _verifyProductsAreReturnable in AddSalesReturnApi

---
 meta/api-docs/add-sales-return.md       |  1 +
 server/src/apis/add-sales-return.js     |  2 +-
 server/src/apis/mixins/product-mixin.js | 28 +++++++++++--------------
 server/test/test-sales-return-apis.js   |  1 -
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/meta/api-docs/add-sales-return.md b/meta/api-docs/add-sales-return.md
index c60b46ce7..b87e92571 100644
--- a/meta/api-docs/add-sales-return.md
+++ b/meta/api-docs/add-sales-return.md
@@ -39,6 +39,7 @@ Possible Error Codes:
 { code: SALES_INVALID } // sales not found
 { code: PRODUCT_INVALID } // product not found
 { code: OUTLET_INVENTORY_INVALID } // outler returned inventory invalid
+{ code: PRODUCT_CATEGORY_INVALID }
 { code: PRODUCT_CATEGORY_NON_RETURNABLE } // product in list is non-returnable
 ```
 
diff --git a/server/src/apis/add-sales-return.js b/server/src/apis/add-sales-return.js
index 73fe95b2f..f66f5bb11 100644
--- a/server/src/apis/add-sales-return.js
+++ b/server/src/apis/add-sales-return.js
@@ -57,7 +57,7 @@ exports.AddSalesReturnApi = class extends Api.mixin(InventoryMixin, CustomerMixi
     let sales = await this.database.sales.findById({ id: salesId });
 
     await this._verifyProductsExist({ productList: returnedProductList });
-    // _verifyProductsAreReturnable in returnedProductList
+    await this._verifyProductsAreReturnable({ productList: returnedProductList });
     let outletReturnedInventory = await this.__getOutletReturnedInventory({ outletId: salesId.outletId });
     
     if (shouldSaveReturnableInChangeWallet && sales.customerId && creditedAmount) {
diff --git a/server/src/apis/mixins/product-mixin.js b/server/src/apis/mixins/product-mixin.js
index 35359b114..4b8edc9a2 100644
--- a/server/src/apis/mixins/product-mixin.js
+++ b/server/src/apis/mixins/product-mixin.js
@@ -5,26 +5,22 @@ exports.ProductMixin = (SuperApiClass) => class extends SuperApiClass {
   async _verifyProductsExist({ productList }) {
     let productIdList = productList.map(product => product.productId);
     let newProductList = await this.database.product.listByIdList({ idList: productIdList });
-    throwOnFalsy(newProductList.length, "PRODUCT_INVALID", "Unable to find all products in productList")
+    throwOnFalsy(newProductList.length, "PRODUCT_INVALID", "Unable to find all products in productList");
     return;
   }
 
-  _verifyProductsAreReturnable({ productList }, cbfn) {
+  async _verifyProductsAreReturnable({ productList }) {
     let productIdList = productList.map(product => product.productId);
-    this.legacyDatabase.product.findByIdList({ idList: productIdList }, (err, _productList) => {
-      let productCategoryIdList = _productList.map(product => product.productCategoryId);
-      this.legacyDatabase.productCategory.listByIdList({ idList: productCategoryIdList }, (err, productCategoryList) => {
-        if (err) return this.fail(err);
-        for (let productCategory of productCategoryList) {
-          if (productCategory.isReturnable == false) {
-            err = new Error("product in list is non-returnable");
-            err.code = "PRODUCT_CATEGORY_NON_RETURNABLE";
-            return this.fail(err);
-          }
-        }
-        return cbfn();
-      });
-    });
+    let newProductList = await this.database.product.listByIdList({ idList: productIdList });
+    let productCategoryIdList = newProductList.map(product => product.productCategoryId);
+    let productCategoryList = await this.database.productCategory.listByIdList({ idList: productCategoryIdList });
+    throwOnFalsy(productCategoryList.length, "PRODUCT_CATEGORY_INVALID", "Unable to find all product categories");
+
+    for (let productCategory of productCategoryList) {
+      throwOnFalsy(productCategory.isReturnable, "PRODUCT_CATEGORY_NON_RETURNABLE", "product in list is non-returnable");
+    }
+
+    return;
   }
 
 }
\ No newline at end of file
diff --git a/server/test/test-sales-return-apis.js b/server/test/test-sales-return-apis.js
index 1c0b13bcf..fd3581bfe 100644
--- a/server/test/test-sales-return-apis.js
+++ b/server/test/test-sales-return-apis.js
@@ -302,7 +302,6 @@ describe.only('Sales Return', _ => {
         shouldSaveReturnableInChangeWallet: false
       }
     }, (err, response, body) => {
-      console.log(body);
       expect(response.statusCode).to.equal(200);
       validateGenericApiFailureResponse(body);
       expect(body.error.code).equal('PRODUCT_INVALID');

From aaa20a89a3511bd100bcb2954a367ff7034e01f9 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Sun, 7 Oct 2018 20:25:07 +0600
Subject: [PATCH 68/74] AddSalesReturnApi mostly done

---
 server/src/apis/add-sales-return.js | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/server/src/apis/add-sales-return.js b/server/src/apis/add-sales-return.js
index f66f5bb11..0b7e36c83 100644
--- a/server/src/apis/add-sales-return.js
+++ b/server/src/apis/add-sales-return.js
@@ -51,6 +51,27 @@ exports.AddSalesReturnApi = class extends Api.mixin(InventoryMixin, CustomerMixi
     }];
   }
 
+  _returnProducts({ returnedProductList, outletReturnedInventory }, cbfn) {
+    let promiseList = [];
+    returnedProductList.forEach(product => {
+      let promise = new Promise((accept, reject) => {
+        this.legacyDatabase.inventory.addProduct({ inventoryId: outletReturnedInventory.id }, { productId: product.productId, count: product.count }, (err) => {
+          if (err) return reject(err);
+          accept();
+        });
+      });
+      promiseList.push(promise);
+    });
+
+    Promise.all(promiseList)
+      .then(_ => {
+        return cbfn(outletReturnedInventory);
+      })
+      .catch(err => {
+        return this.fail(err);
+      })
+  }
+
   async handle({ body }) {
     let { salesId, returnedProductList, creditedAmount, shouldSaveReturnableInChangeWallet } = body;
 
@@ -58,14 +79,14 @@ exports.AddSalesReturnApi = class extends Api.mixin(InventoryMixin, CustomerMixi
 
     await this._verifyProductsExist({ productList: returnedProductList });
     await this._verifyProductsAreReturnable({ productList: returnedProductList });
-    let outletReturnedInventory = await this.__getOutletReturnedInventory({ outletId: salesId.outletId });
     
     if (shouldSaveReturnableInChangeWallet && sales.customerId && creditedAmount) {
       let customer = await this.database.customer.findById({ id: sales.customerId });
       await this._addChangeToChangeWallet({ customer, amount: creditedAmount });
     }
 
-    // _returnProducts to outletReturnedInventory
+    let outletReturnedInventory = await this.__getOutletReturnedInventory({ outletId: salesId.outletId });
+    // returnedProductList to outletReturnedInventory via _returnProducts
     let salesReturnId = await this.database.salesReturn.create({ salesId, returnedProductList, creditedAmount, shouldSaveReturnableInChangeWallet });
     
     return { status: "success", salesReturnId };

From 2fdfedda98c5a091e97c2c9c05cb328f947ebf3e Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Mon, 8 Oct 2018 12:07:23 +0600
Subject: [PATCH 69/74] AddSalesReturnApi done

---
 server/src/apis/add-sales-return.js       | 29 +++++++----------------
 server/src/apis/mixins/inventory-mixin.js |  4 ++--
 server/test/test-sales-return-apis.js     |  2 +-
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/server/src/apis/add-sales-return.js b/server/src/apis/add-sales-return.js
index 0b7e36c83..fb61a023d 100644
--- a/server/src/apis/add-sales-return.js
+++ b/server/src/apis/add-sales-return.js
@@ -51,25 +51,12 @@ exports.AddSalesReturnApi = class extends Api.mixin(InventoryMixin, CustomerMixi
     }];
   }
 
-  _returnProducts({ returnedProductList, outletReturnedInventory }, cbfn) {
-    let promiseList = [];
-    returnedProductList.forEach(product => {
-      let promise = new Promise((accept, reject) => {
-        this.legacyDatabase.inventory.addProduct({ inventoryId: outletReturnedInventory.id }, { productId: product.productId, count: product.count }, (err) => {
-          if (err) return reject(err);
-          accept();
-        });
-      });
-      promiseList.push(promise);
-    });
-
-    Promise.all(promiseList)
-      .then(_ => {
-        return cbfn(outletReturnedInventory);
-      })
-      .catch(err => {
-        return this.fail(err);
-      })
+  async _returnProducts({ returnedProductList, outletReturnedInventory }) {
+    for(let i=0; i<returnedProductList.length; i++) {
+      let product = returnedProductList[i];
+      await this.database.inventory.addProduct({ id: outletReturnedInventory.id }, { productId: product.productId, count: product.count });
+    }
+    return;
   }
 
   async handle({ body }) {
@@ -85,8 +72,8 @@ exports.AddSalesReturnApi = class extends Api.mixin(InventoryMixin, CustomerMixi
       await this._addChangeToChangeWallet({ customer, amount: creditedAmount });
     }
 
-    let outletReturnedInventory = await this.__getOutletReturnedInventory({ outletId: salesId.outletId });
-    // returnedProductList to outletReturnedInventory via _returnProducts
+    let outletReturnedInventory = await this.__getOutletReturnedInventory({ outletId: sales.outletId });
+    await this._returnProducts({ returnedProductList, outletReturnedInventory });
     let salesReturnId = await this.database.salesReturn.create({ salesId, returnedProductList, creditedAmount, shouldSaveReturnableInChangeWallet });
     
     return { status: "success", salesReturnId };
diff --git a/server/src/apis/mixins/inventory-mixin.js b/server/src/apis/mixins/inventory-mixin.js
index 89f494ff1..a290b4a50 100644
--- a/server/src/apis/mixins/inventory-mixin.js
+++ b/server/src/apis/mixins/inventory-mixin.js
@@ -10,14 +10,14 @@ exports.InventoryMixin = (SuperApiClass) => class extends SuperApiClass {
 
   async __getOutletDefaultInventory({ outletId }) {
     let inventoryList = await this.database.inventory.listByInventoryContainerId({ inventoryContainerId: outletId, inventoryContainerType: 'outlet' });
-    throwOnFalsy(inventoryList, "OUTLET_INVENTORY_INVALID", "Invalid Outlet Or Inventory could not be found");
+    throwOnFalsy(inventoryList.length, "OUTLET_INVENTORY_INVALID", "Invalid Outlet Or Inventory could not be found");
     let outletDefaultInventory = inventoryList.find(inventory => inventory.type === 'default');
     return outletDefaultInventory;
   }
 
   async __getOutletReturnedInventory({ outletId }) {
     let inventoryList = await this.database.inventory.listByInventoryContainerId({ inventoryContainerId: outletId, inventoryContainerType: 'outlet' });
-    throwOnFalsy(inventoryList, "OUTLET_INVENTORY_INVALID", "Invalid Outlet Or Inventory could not be found");
+    throwOnFalsy(inventoryList.length, "OUTLET_INVENTORY_INVALID", "Invalid Outlet Or Inventory could not be found");
     let outletReturnedInventory = inventoryList.find(inventory => inventory.type === 'returned');
     return outletReturnedInventory;
   }
diff --git a/server/test/test-sales-return-apis.js b/server/test/test-sales-return-apis.js
index fd3581bfe..241fc859f 100644
--- a/server/test/test-sales-return-apis.js
+++ b/server/test/test-sales-return-apis.js
@@ -87,7 +87,7 @@ let fromDate = new Date();
 fromDate.setDate(fromDate.getDate() - 1);
 fromDate = fromDate.getTime();
 
-describe.only('Sales Return', _ => {
+describe('Sales Return', _ => {
 
   it('START', testDoneFn => {
     initializeServer(_ => {

From 2806e682d61c0859354b69c0d52666e01be63594 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Mon, 8 Oct 2018 12:08:01 +0600
Subject: [PATCH 70/74] depr

---
 server/src/index.js                                             | 1 -
 .../{add-sales-return.js => __depr__add-sales-return.js}        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
 rename server/src/legacy-apis/{add-sales-return.js => __depr__add-sales-return.js} (98%)

diff --git a/server/src/index.js b/server/src/index.js
index 69c225aee..474f8e3a7 100644
--- a/server/src/index.js
+++ b/server/src/index.js
@@ -80,7 +80,6 @@ let { GetSalesApi } = require('./legacy-apis/get-sales');
 const { GetSalesListApi } = require('./apis/get-sales-list');
 let { DiscardSalesApi } = require('./legacy-apis/discard-sales');
 
-// let { AddSalesReturnApi } = require('./legacy-apis/add-sales-return');
 const { AddSalesReturnApi } = require('./apis/add-sales-return');
 let { GetSalesReturnApi } = require('./legacy-apis/get-sales-return');
 let { GetSalesReturnListApi } = require('./legacy-apis/get-sales-return-list');
diff --git a/server/src/legacy-apis/add-sales-return.js b/server/src/legacy-apis/__depr__add-sales-return.js
similarity index 98%
rename from server/src/legacy-apis/add-sales-return.js
rename to server/src/legacy-apis/__depr__add-sales-return.js
index 977c26c11..7696f559f 100644
--- a/server/src/legacy-apis/add-sales-return.js
+++ b/server/src/legacy-apis/__depr__add-sales-return.js
@@ -1,4 +1,4 @@
-let { LegacyApi } = require('./../legacy-api-base');
+let { LegacyApi } = require('../legacy-api-base');
 let Joi = require('joi');
 
 let { collectionCommonMixin } = require('./mixins/collection-common');

From 146d30f35040d9c4f0a551f082d9ed0d8ab0e982 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Mon, 8 Oct 2018 12:18:46 +0600
Subject: [PATCH 71/74] default set of paidAmount removed

---
 client/src/page-pos.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/page-pos.html b/client/src/page-pos.html
index 464c9d657..8ca6502aa 100644
--- a/client/src/page-pos.html
+++ b/client/src/page-pos.html
@@ -445,7 +445,7 @@
         }
 
         // setting the default paid amount equal to total billed
-        if (!paidAmount) {
+        if (paymentMethod !== 'cash' && paidAmount < 1) {
           paidAmount = totalBilled;
         }
 

From 4b1904eee43fb429d79468adb0641f1b0e196428 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Mon, 8 Oct 2018 13:09:27 +0600
Subject: [PATCH 72/74] ElemAdditionalPayment translated

---
 client/src/elem-additional-payment.html         | 17 ++++++++---------
 client/src/lang-bn-bd.json                      | 11 ++++++++++-
 client/src/lang-en-us.json                      | 11 ++++++++++-
 client/src/page-pos.html                        |  2 +-
 client/src/page-view-sales.html                 |  3 +--
 ...age-withdraw-from-change-wallet-balance.html |  2 +-
 server/src/apis/add-additional-payment.js       |  2 +-
 7 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/client/src/elem-additional-payment.html b/client/src/elem-additional-payment.html
index 67aa82209..eddf14d5c 100644
--- a/client/src/elem-additional-payment.html
+++ b/client/src/elem-additional-payment.html
@@ -48,38 +48,37 @@
       <div class="list">
 
         <div class="individual-calculation-field-container">
-          <!-- TRANSLATE -->
-          Due amount:
+          [[verses.additionalPayment.dueAmount]]:
           <b>{{$round(amountLeftToPay)}} [[page.app.settings.monetaryUnit]]</b>
         </div>
 
         <div class="individual-calculation-field-container">
 
-          <paper-dropdown-menu class="full-width-paper-dropdown" label="[[verses.pos.paymentMethod]]" class="mr-4" on-iron-select="paymentMethodSelected">
+          <paper-dropdown-menu class="full-width-paper-dropdown" label="[[verses.additionalPayment.paymentMethod]]" class="mr-4" on-iron-select="paymentMethodSelected">
             <paper-listbox slot="dropdown-content" selected="{{payment.paymentMethod}}" attr-for-selected="name">
               <paper-item name="cash">[[verses.general.cash]]</paper-item>
               <paper-item name="card">[[verses.general.card]]</paper-item>
               <paper-item name="digital">[[verses.general.digital]]</paper-item>
               <template is="dom-if" if="[[customer]]">
-                <paper-item name="change-wallet">change wallet</paper-item>
+                <paper-item name="change-wallet">[[verses.general.balance]]</paper-item>
               </template>
             </paper-listbox>
           </paper-dropdown-menu>
 
           <template is="dom-if" if="[[!isPaymentMethodChangeWallet(payment.paymentMethod)]]">
-            <paper-input class="payment--paidAmount" value="{{payment.paidAmount}}" on-input="genericPaymentInputChanged" on-change="genericPaymentInputChanged" type="number" required min="0" error-message="[[verses.pos.paidAmountInputError]]" label="[[verses.pos.paidAmountInput]]">
+            <paper-input class="payment--paidAmount" value="{{payment.paidAmount}}" min="1" on-input="genericPaymentInputChanged" on-change="genericPaymentInputChanged" type="number" required min="0" error-message="[[verses.additionalPayment.paidAmountInputError]]" label="[[verses.additionalPayment.paidAmountInput]]">
               <div slot="suffix">[[app.settings.monetaryUnit]]</div>
             </paper-input>
           </template>
 
           <template is="dom-if" if="[[payment.changeAmount]]">
-            <br> [[verses.pos.changeAmount]]:
+            <br> [[verses.additionalPayment.changeAmount]]:
             <b>{{$round(payment.changeAmount)}} [[app.settings.monetaryUnit]]</b>
             <br>
             <template is="dom-if" if="[[customer]]">
               <template is="dom-if" if="[[payment.changeAmount]]">
                 <paper-checkbox class="should-save-change" checked="{{payment.shouldSaveChangeInAccount}}">
-                  [[verses.pos.shouldSaveChangeInAccount]]
+                  [[verses.additionalPayment.shouldSaveChangeInAccount]]
                 </paper-checkbox>
               </template>
             </template>
@@ -88,9 +87,8 @@
         </div>
 
         <template is="dom-if" if="[[isFromViewSalesPage]]">
-          <!-- TRANSLATE -->
           <div class="horizontal layout m-top-16">
-            <paper-button raised class="primary flex" on-tap="addPaymentTapped">Add Additional Payment</paper-button>
+            <paper-button raised class="primary flex" on-tap="addPaymentTapped">[[verses.additionalPayment.addAdditionalPayment]]</paper-button>
           </div>
         </template>
 
@@ -170,6 +168,7 @@
       }
 
       genericPaymentInputChanged(e) {
+        this.enforceMinMaxOnPaperInput(e);
         this._calculatePayment();
       }
 
diff --git a/client/src/lang-bn-bd.json b/client/src/lang-bn-bd.json
index 39e806a2b..52a65c921 100644
--- a/client/src/lang-bn-bd.json
+++ b/client/src/lang-bn-bd.json
@@ -29,7 +29,7 @@
     "showMore": "আরও দেখাও",
     "name": "নাম",
     "phone": "ফোন",
-    "balance": "ব্যালান্স",
+    "balance": "অ্যাকাউন্ট ব্যালান্স",
     "view": "দেখুন",
     "edit": "পরিবর্তন করুন",
     "showing": "দেখাচ্ছে",
@@ -685,6 +685,15 @@
     "expectedColumn": "প্রত্যাশিত কলাম",
     "missingCellsInRow": "নং শাড়িতে তথ্য নেই"
   },
+  "additionalPayment": {
+    "paymentMethod": "মূল্যপরিশোধ পদ্ধতি",
+    "paidAmountInput": "পরিশোধিত পরিমাণ",
+    "paidAmountInputError": "একটি সঠিক নম্বর লিখুন",
+    "changeAmount": "ফেরত পরিমান",
+    "shouldSaveChangeInAccount": "অর্থ প্রদানের পরিবর্তে গ্রাহকের অ্যাকাউন্ট সংরক্ষণ করুন",
+    "addAdditionalPayment": "অতিরিক্ত অর্থ প্রদান করুন",
+    "dueAmount": "বাকি অর্থ"
+  },
   "withdrawFromChangeWalletBalance": {
     "withdrawFromChangeWalletBalanceTitle": "Withdraw from change wallet balance",
     "amountInput": "অর্থ পরিমাণ",
diff --git a/client/src/lang-en-us.json b/client/src/lang-en-us.json
index c94ee20d0..bc90679f1 100644
--- a/client/src/lang-en-us.json
+++ b/client/src/lang-en-us.json
@@ -29,7 +29,7 @@
     "showMore": "Show More",
     "name": "Name",
     "phone": "Phone",
-    "balance": "Balance",
+    "balance": "Account Balance",
     "view": "View",
     "edit": "Edit",
     "showing": "Showing",
@@ -683,6 +683,15 @@
     "expectedColumn": "Expected column",
     "missingCellsInRow": "No row missing data"
   },
+  "additionalPayment": {
+    "paymentMethod": "Payment Method",
+    "paidAmountInput": "Paid Amount",
+    "paidAmountInputError": "Enter a valid number",
+    "changeAmount": "Change Amount",
+    "shouldSaveChangeInAccount": "Save in customer's account instead of paying cash.",
+    "addAdditionalPayment": "Add Additional Payment",
+    "dueAmount": "Due amount"
+  },
   "withdrawFromChangeWalletBalance": {
     "withdrawFromChangeWalletBalanceTitle": "Withdraw from change wallet balance",
     "amountInput": "Amount",
diff --git a/client/src/page-pos.html b/client/src/page-pos.html
index 8ca6502aa..c4b79a8ff 100644
--- a/client/src/page-pos.html
+++ b/client/src/page-pos.html
@@ -223,7 +223,7 @@
                   <paper-item name="card">[[verses.general.card]]</paper-item>
                   <paper-item name="digital">[[verses.general.digital]]</paper-item>
                   <template is="dom-if" if="[[customer]]">
-                    <paper-item name="change-wallet">[[verses.general.changeWallet]]</paper-item>
+                    <paper-item name="change-wallet">[[verses.general.balance]]</paper-item>
                   </template>
                 </paper-listbox>
               </paper-dropdown-menu>
diff --git a/client/src/page-view-sales.html b/client/src/page-view-sales.html
index 066a9dc6e..6883bf962 100644
--- a/client/src/page-view-sales.html
+++ b/client/src/page-view-sales.html
@@ -119,8 +119,7 @@
       </div>
 
       <template is="dom-if" if="[[$shouldTakeAdditionalPayment(sales.payment.totalBilled,  sales.payment.totalPaidAmount)]]">
-        <elem-additional-payment amount-left-to-pay="[[amountLeftToPay]]" page="[[self]]" customer="[[customer]]" is-from-view-sales-page>
-          </elem-additional-paymentt>
+        <elem-additional-payment amount-left-to-pay="[[amountLeftToPay]]" page="[[self]]" customer="[[customer]]" is-from-view-sales-page></elem-additional-paymentt>
       </template>
 
       <template is="dom-if" if="{{sales.customerId}}">
diff --git a/client/src/page-withdraw-from-change-wallet-balance.html b/client/src/page-withdraw-from-change-wallet-balance.html
index 79b03b282..048ff6110 100644
--- a/client/src/page-withdraw-from-change-wallet-balance.html
+++ b/client/src/page-withdraw-from-change-wallet-balance.html
@@ -37,7 +37,7 @@
         <form>
           <div class="card vertical layout">
 
-            <div>[[verses.general.changeWallet]]: [[$round(editingCustomer.changeWalletBalance)]] [[app.settings.monetaryUnit]]</div>
+            <div>[[verses.general.balance]]: [[$round(editingCustomer.changeWalletBalance)]] [[app.settings.monetaryUnit]]</div>
             <paper-input class="withdrawFromChangeWalletBalanceForm--amount" value="{{withdrawFromChangeWalletBalanceForm.amount}}" type="number" required min="1" max="[[editingCustomer.changeWalletBalance]]" on-input="genericNumericInputChanged" on-change="genericNumericInputChanged" error-message=[[verses.withdrawFromChangeWalletBalance.amountInputError]] label=[[verses.withdrawFromChangeWalletBalance.amountInput]]></paper-input>
             <paper-button raised class="primary" on-tap="withdrawFromChangeWalletBalanceTapped">[[verses.withdrawFromChangeWalletBalance.withdraw]]</paper-button>
 
diff --git a/server/src/apis/add-additional-payment.js b/server/src/apis/add-additional-payment.js
index e8001739d..daeb39527 100644
--- a/server/src/apis/add-additional-payment.js
+++ b/server/src/apis/add-additional-payment.js
@@ -18,7 +18,7 @@ exports.AddAdditionalPaymentApi = class extends Api.mixin(InventoryMixin, Custom
       customerId: Joi.number().max(999999999999999).required(),
       payment: Joi.object().keys({
         paymentMethod: Joi.string().valid('cash', 'card', 'digital', 'change-wallet').required(),
-        paidAmount: Joi.number().max(999999999999999).required(),
+        paidAmount: Joi.number().min(1).max(999999999999999).required(),
         changeAmount: Joi.number().max(999999999999999).required(),
         shouldSaveChangeInAccount: Joi.boolean().required()
       })

From 2a30c542a0495b56b17b51636542f3f85ae43613 Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Mon, 8 Oct 2018 13:14:52 +0600
Subject: [PATCH 73/74] PageEditSalesReturn better

---
 client/src/lang-bn-bd.json             | 1 +
 client/src/lang-en-us.json             | 1 +
 client/src/page-edit-sales-return.html | 1 +
 3 files changed, 3 insertions(+)

diff --git a/client/src/lang-bn-bd.json b/client/src/lang-bn-bd.json
index 52a65c921..be3ad21fa 100644
--- a/client/src/lang-bn-bd.json
+++ b/client/src/lang-bn-bd.json
@@ -417,6 +417,7 @@
   "salesReturn": {
     "pageTitle": "বিক্রয় ফেরত",
     "soldCount": "বিক্রি গণনা",
+    "salePrice": "বিক্রি দাম",
     "returnCount": "ফেরত গণনা",
     "productReturnCountInput": "পণ্য ফেরত গণনা",
     "productReturnCountInputError": "একটি সঠিক নম্বর লিখুন",
diff --git a/client/src/lang-en-us.json b/client/src/lang-en-us.json
index bc90679f1..cd364c72a 100644
--- a/client/src/lang-en-us.json
+++ b/client/src/lang-en-us.json
@@ -559,6 +559,7 @@
   "salesReport": {
     "salesReportTitle": "Sales Report",
     "showFilters": "Show Filters",
+    "salePrice": "Sale Price",
     "noCustomerSelected": "No customer selected (Anonymous Sale)",
     "removeCustomer": "Remove Customer",
     "changeCustomer": "Change Customer",
diff --git a/client/src/page-edit-sales-return.html b/client/src/page-edit-sales-return.html
index c7b18af1a..a0e71f654 100644
--- a/client/src/page-edit-sales-return.html
+++ b/client/src/page-edit-sales-return.html
@@ -38,6 +38,7 @@
           <div class="card vertical layout">
 
             <div>[[productToBeReturned.productCategoryName]]</div>
+            <div>[[verses.salesReturn.salePrice]] [[productToBeReturned.salePrice]]</div>
             <div>[[verses.salesReturn.soldCount]]: [[productToBeReturned.count]]</div>
             <div>[[verses.salesReturn.returnCount]]: [[productToBeReturned.returnedProductCount]]</div>
             

From c7ff1135caed92b667a73071c4767ba169db086e Mon Sep 17 00:00:00 2001
From: iLGunners <mujtabanowshad@gmail.com>
Date: Mon, 8 Oct 2018 13:46:45 +0600
Subject: [PATCH 74/74] done

---
 client/src/lang-bn-bd.json | 6 +++---
 client/src/lang-en-us.json | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/src/lang-bn-bd.json b/client/src/lang-bn-bd.json
index be3ad21fa..c1f7863d7 100644
--- a/client/src/lang-bn-bd.json
+++ b/client/src/lang-bn-bd.json
@@ -356,7 +356,7 @@
   },
   "customer": {
     "editCustomerTitle": "গ্রাহক সম্পাদনা করুন",
-    "withdrawFromChangeWalletBalance": "Withdraw from change wallet balance",
+    "withdrawFromChangeWalletBalance": "গ্রাহকের অ্যাকাউন্ট ব্যালান্স থেকে সরান",
     "addCustomerTitle": "গ্রাহক যুক্ত করুন",
     "customerNameInput": "গ্রাহকের নাম",
     "customerNameInputError": "একটি সঠিক নাম লিখুন",
@@ -696,10 +696,10 @@
     "dueAmount": "বাকি অর্থ"
   },
   "withdrawFromChangeWalletBalance": {
-    "withdrawFromChangeWalletBalanceTitle": "Withdraw from change wallet balance",
+    "withdrawFromChangeWalletBalanceTitle": "গ্রাহকের অ্যাকাউন্ট ব্যালান্স থেকে সরান",
     "amountInput": "অর্থ পরিমাণ",
     "amountInputError": "অর্থ পরিমাণ লিখুন",
     "withdraw": "সরান",
-    "customerBalanceUpdated": "গ্রাহকের change wallet ব্যালান্স আপডেট হয়ে গিয়েছে।"
+    "customerBalanceUpdated": "গ্রাহকের অ্যাকাউন্ট ব্যালান্স আপডেট হয়ে গিয়েছে।"
   }
 }
\ No newline at end of file
diff --git a/client/src/lang-en-us.json b/client/src/lang-en-us.json
index cd364c72a..a73c86cf3 100644
--- a/client/src/lang-en-us.json
+++ b/client/src/lang-en-us.json
@@ -354,7 +354,7 @@
   },
   "customer": {
     "editCustomerTitle": "Edit Customer",
-    "withdrawFromChangeWalletBalance": "Withdraw from change wallet balance",
+    "withdrawFromChangeWalletBalance": "Withdraw from customer account balance",
     "addCustomerTitle": "Add Customer",
     "customerNameInput": "Name of your customer.",
     "customerNameInputError": "Enter a valid name",
@@ -694,7 +694,7 @@
     "dueAmount": "Due amount"
   },
   "withdrawFromChangeWalletBalance": {
-    "withdrawFromChangeWalletBalanceTitle": "Withdraw from change wallet balance",
+    "withdrawFromChangeWalletBalanceTitle": "Withdraw from customer account balance",
     "amountInput": "Amount",
     "amountInputError": "Enter the amount",
     "withdraw": "Withdraw",