Merge pull request #691 from iShafayet/sprint-0.2.4

Sprint 0.2.4
anvilglobaldynamics · May 29, 2019 · 7d2617f · 7d2617f
2 parents 65ed25d + 5d5dd56
commit 7d2617f
Show file tree

Hide file tree

Showing 22 changed files with 334 additions and 95 deletions.
diff --git a/client/src/elem-customer-selector.html b/client/src/elem-customer-selector.html
@@ -98,7 +98,7 @@
         <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">
-          <iron-icon icon="search" class="m-right-8"></iron-icon>[[verses.general.search]]
+          <iron-icon icon="search" class="m-right-8"></iron-icon>
         </paper-button>
       </div>
 
@@ -119,8 +119,11 @@
                 </div>
               </div>
             </div>
-            <paper-button raised class="primary btn btn-default" on-tap="selectTapped">[[verses.general.select]]</paper-button>
 
+            <!-- selection button -->
+            <paper-button raised class="secondary btn btn-default" on-tap="selectTapped">
+              <iron-icon icon="check" class="m-right-8"></iron-icon>
+            </paper-button>
 
           </div>
         </template>

diff --git a/client/src/lang-bn-bd.json b/client/src/lang-bn-bd.json
@@ -89,6 +89,7 @@
     "moduleDescriptionLineTwo": "লিপি তে আরো ফীচার এবং কার্যকারিতা যোগ করতে আমাদের সাথে যোগাযোগ করুন এই নম্বরে +880 1770 947908 অথবা care@anvil.live এ মেইল লিখুন ",
     "productModule": "প্রোডাক্ট মডিউল",
     "serviceModule": "সেবা মডিউল",
+    "sellWarehouseProductModule": "গুদাম-এর পণ্য বিক্রয় মডিউল",
     "gymModule": "জিমনেসিয়াম মডিউল",
     "retail": "পণ্য বিক্রয়",
     "service": "সেবা বিক্রয়",
@@ -278,7 +279,6 @@
     "physicalAddress": "ঠিকানা",
     "currentLocation": "এখন যেখানে আছেন",
     "saveLocation": "অবস্থান নিশ্চিত করুন",
-
     "noGpsAccess": "অনুমতি নেই",
     "failedToAccessGpsData": "আপনার অবস্থান জানার অনুমতি দেয়া হয়নি। অনুগ্রহপূর্বক অনুমতি দিন।",
     "noGpsSupport": "ব্যবস্থা নেই",
@@ -567,7 +567,7 @@
     "serviceList": "সেবা তালিকা",
     "salePrice": "বিক্রয় মূল্য",
     "payment": "টাকা প্রদান",
-    "totalBilled": "মোট বিল",
+    "totalBilled": "মোট পরিশোধনীয়",
     "discounted": "ছাড়",
     "serviceChargeAmount": "সেবা মূল্য",
     "vat": "ভ্যাট",
@@ -644,10 +644,11 @@
   "pos": {
     "posPageTitle": "বিক্রয়কেন্দ্র",
     "newSalesAdded": "নতুন বিক্রয় যুক্ত করা হয়েছে।",
+    "customerSelectionCardHeader": "গ্রাহক বাছাই",
     "noCustomerSelected": "কোন গ্রাহক নির্বাচন করা হয়নি",
     "removeCustomer": "সরান",
-    "changeCustomer": "গ্রাহক বাছাই",
-    "createCustomer": "নতুন গ্রাহক",
+    "changeCustomer": "পুরাতন",
+    "createCustomer": "নতুন",
     "count": "গণনা",
     "selectProduct": "পণ্য নির্বাচন করুন",
     "discountType": "ছাড় প্রকার",
@@ -660,8 +661,7 @@
     "serviceChargeInput": "সার্ভিস চার্জ",
     "serviceChargeInputError": "একটি সঠিক নম্বর লিখুন",
     "totalSalePrice": "মোট বিক্রয় মূল্য",
-    "totalAmount": "মোট পরিমান",
-    "totalBilled": "মোট বিল",
+    "totalBilled": "মোট পরিশোধনীয়",
     "previousCustomerBalance": "পূর্ববর্তী গ্রাহক ব্যালেন্স",
     "paidAmountInput": "পরিশোধিত পরিমান",
     "paidAmountInputError": "একটি সঠিক নম্বর লিখুন",
@@ -691,7 +691,11 @@
     "assignedEmployee": "দায়িত্ব দেয়া",
     "assignEmployee": "দায়িত্ব দেন",
     "noDiscountApplicable": "প্রযোজ্য নয়",
-    "assistedEmployee": "সহায়তায়"
+    "assistedEmployee": "সহায়তায়",
+    "selectProductsFromInventoryContainer": "কোন দোকান/গুদাম থেকে বিক্রি হবে?",
+    "currentOutlet": "বর্তমান দোকান",
+    "saleNotValid": "বিক্রয় সঠিক নয়",
+    "offlineWarehouseSellNotAllowed": "অফলাইন মোডে গুদাম থেকে পণ্য বিক্রি করতে পারবেন না।"
   },
   "salesReport": {
     "salesReportTitle": "বিক্রয় বিবরণ",
@@ -914,11 +918,11 @@
     "printedBy": "প্রিন্ট করেছেন",
     "soldBy": "বিক্রয়কারী",
     "customerName": "গ্রাহকের নাম",
-    "totalAmount": "মোট",
+    "totalAmount": "মোট বিক্রয় মূল্য",
     "vatAmount": "ভ্যাট",
     "discountedAmount": "ছাড়",
     "serviceChargeInput": "সার্ভিস চার্জ",
-    "totalBilled": "মোট বিল",
+    "totalBilled": "মোট পরিশোধনীয়",
     "paidAmountInput": "পরিশোধিত",
     "changeAmount": "ফেরত",
     "dueAmount": "বাকি অর্থ"

diff --git a/client/src/lang-en-us.json b/client/src/lang-en-us.json
@@ -89,6 +89,7 @@
     "moduleDescriptionLineTwo": "To add more features to Lipi, contact us at +880 1770 947908 or mail us at care@anvil.live",
     "productModule": "Product Module",
     "serviceModule": "Service Module",
+    "sellWarehouseProductModule": "Sell Warehouse Products Module",
     "gymModule": "Gym Module",
     "retail": "Retail",
     "service": "Service",
@@ -566,7 +567,7 @@
     "serviceList": "Service List",
     "salePrice": "Sale Price",
     "payment": "Payment",
-    "totalBilled": "Total Billed",
+    "totalBilled": "Total Payable",
     "discounted": "Discounted",
     "serviceChargeAmount": "Service Charge Amount",
     "vat": "VAT",
@@ -643,10 +644,11 @@
   "pos": {
     "posPageTitle": "POS",
     "newSalesAdded": "New Sales has been added.",
+    "customerSelectionCardHeader": "Customer Selection",
     "noCustomerSelected": "No customer selected (Anonymous Sale)",
     "removeCustomer": "Remove",
-    "changeCustomer": "Select Customer",
-    "createCustomer": "New Customer",
+    "changeCustomer": "Old",
+    "createCustomer": "New",
     "count": "Count",
     "selectProduct": "Select Product",
     "discountType": "Discount Type",
@@ -659,8 +661,7 @@
     "serviceChargeInput": "Service Charge Amount",
     "serviceChargeInputError": "Enter a valid number",
     "totalSalePrice": "Total Sale Price",
-    "totalAmount": "Total Amount",
-    "totalBilled": "Total Billed",
+    "totalBilled": "Total Payable",
     "previousCustomerBalance": "Previous Customer Balance",
     "paidAmountInput": "Paid Amount",
     "paidAmountInputError": "Enter a valid number",
@@ -690,7 +691,11 @@
     "assignedEmployee": "Assigned",
     "assignEmployee": "Assign",
     "noDiscountApplicable": "Not Applicable",
-    "assistedEmployee": "Assisted by"
+    "assistedEmployee": "Assisted by",
+    "selectProductsFromInventoryContainer": "Which Outlet/Warehouse you want to sell from?",
+    "currentOutlet": "Current Outlet",
+    "saleNotValid": "Sale not valid",
+    "offlineWarehouseSellNotAllowed":"Can not sell products from warehouse when in offline mode."
   },
   "salesReport": {
     "salesReportTitle": "Sales Report",
@@ -914,11 +919,11 @@
     "printedBy": "Printed By",
     "soldBy": "Sold By",
     "customerName": "Customer Name",
-    "totalAmount": "Total",
+    "totalAmount": "Total Sale Price",
     "vatAmount": "VAT",
     "discountedAmount": "Discounted",
     "serviceChargeInput": "Service Charge",
-    "totalBilled": "Total Billed",
+    "totalBilled": "Total Payable",
     "paidAmountInput": "Paid",
     "changeAmount": "Change",
     "dueAmount": "Due"

diff --git a/client/src/page-home.html b/client/src/page-home.html
@@ -500,6 +500,7 @@
       $getModuleDisplayName(moduleCode, selectedLanguageIdentifier = null) {
         if (moduleCode === 'MOD_PRODUCT') return this.app.verses.general.productModule;
         if (moduleCode === 'MOD_SERVICE') return this.app.verses.general.serviceModule;
+        if (moduleCode === 'MOD_SELL_WAREHOUSE_PRODUCTS') return this.app.verses.general.sellWarehouseProductModule;
         if (moduleCode === 'MOD_GYM') return this.app.verses.general.gymModule;
       }