Merge pull request #552 from iShafayet/sprint-0.1.6

Sprint 0.1.6
anvilglobaldynamics · Feb 28, 2019 · 3637b5a · 3637b5a
2 parents cf06686 + bfde080
commit 3637b5a
Show file tree

Hide file tree

Showing 28 changed files with 499 additions and 202 deletions.
diff --git a/client/index.html b/client/index.html
@@ -56,6 +56,7 @@
     body {
       margin: 0;
       font-family: 'Roboto', 'Noto', sans-serif;
+      font-display: block;
       line-height: 1.5;
       min-height: 100vh;
       background-color: #FAFAFA;

diff --git a/client/src/lang-bn-bd.json b/client/src/lang-bn-bd.json
@@ -46,7 +46,7 @@
     "delete": "মুছে ফেলুন",
     "customer": "গ্রাহক",
     "outlet": "দোকান",
-    "filter": "সংকীর্ণ",
+    "filter": "ফিল্টার করুন",
     "date": "তারিখ",
     "dated": "তারিখ",
     "number": "নম্বর",
@@ -91,9 +91,11 @@
     "retail": "পণ্য বিক্রয়",
     "service": "সেবা বিক্রয়",
     "both": "উভয়",
+    "optional": "(ঐচ্ছিক)",
     "print": "প্রিন্ট"
   },
   "login": {
+    "learnMoreAboutLipi": "লিপির বিষয় আরো জানুন",
     "forgotPassword": "পাসওয়ার্ড ভুলে গেছেন?",
     "dontHaveAccount": "অ্যাকাউন্ট নেই?",
     "login": "লগইন",
@@ -522,6 +524,7 @@
   "sales": {
     "manageSalesTitle": "বিক্রয় রেকর্ড",
     "salesId": "বিক্রয় নং",
+    "salesIdNote": "(ঐচ্ছিক, ব্যবহার করলে অন্যান্য ফিল্টার কাজ করবেনা)",
     "billed": "বিল",
     "paid": "প্রদত্ত",
     "products": "টি পণ্য",
@@ -664,7 +667,7 @@
   },
   "salesReport": {
     "salesReportTitle": "বিক্রয় বিবরণ",
-    "showFilters": "সংকীর্ণকারক দেখান",
+    "showFilters": "ফিল্টার দেখান",
     "noCustomerSelected": "কোন গ্রাহক নির্বাচন করা হয়নি",
     "removeCustomer": "গ্রাহক সরান",
     "changeCustomer": "গ্রাহক পরিবর্তন করুন",
@@ -687,11 +690,11 @@
   },
   "inventoriesReport": {
     "inventoriesReportTitle": "পণ্য তালিকার বিবরণ",
-    "showFilters": "সংকীর্ণকারক দেখান",
+    "showFilters": "ফিল্টার দেখান",
     "showSalesProductDetails": "বিক্রয় এবং পণ্যের বিবরণ দেখান হোক",
     "author": "রচক",
     "noProductInInventory": "এই পণ্য তালিকায় কোনো পণ্য নেই।",
-    "filterInventoriesButton": "পণ্য তালিকা সংকীর্ণকারক",
+    "filterInventoriesButton": "পণ্য তালিকা ফিল্টার",
     "selectInventoriesTitle": "পণ্য তালিকা নির্বাচন",
     "selectionTableTitle": "পণ্য তালিকা নির্বাচন ছক",
     "deselectAll": "সব নির্বাচন মুছে দিন",
@@ -733,7 +736,11 @@
     "monetaryUnitDetail": "নোট: আর্থিক মুদ্রা পরিবর্তন আপনার বিক্রয় প্রভাবিত করে না।",
     "moreOptionsForthcoming": "আরো সেটিংস আসন্ন।",
     "minimumProductQuantity": "নূন্যতম পণ্য পরিমান",
-    "minimumProductQuantityDetail": "এই সংখ্যাটির নীচে পণ্য গণনা লাল রঙে দেখানো হবে।"
+    "minimumProductQuantityDetail": "এই সংখ্যাটির নীচে পণ্য গণনা লাল রঙে দেখানো হবে।",
+    "defaultPrinterFormat": "রসিদের জন্য ডিফল্ট প্রিন্টার",
+    "defaultPrinterFormatA4": "A4",
+    "defaultPrinterFormatSlim": "Slim (POS)",
+    "defaultPrinterFormatDetail": "রসিদের জন্য ডিফল্ট প্রিন্টার নির্বাচন করুন"
   },
   "verify": {
     "verificationModalTitle": "যাচাইকরণ এসএমএস পাঠানো হয়েছে",
@@ -878,6 +885,7 @@
     "serviceChargeInput": "সার্ভিস চার্জ",
     "totalBilled": "মোট বিল",
     "paidAmountInput": "পরিশোধিত পরিমান",
+    "changeAmount": "ফেরত পরিমান",
     "dueAmount": "বাকি অর্থ"
   }
 }
diff --git a/client/src/lang-en-us.json b/client/src/lang-en-us.json
@@ -91,9 +91,11 @@
     "retail": "Retail",
     "service": "Service",
     "both": "Both",
+    "optional": "(Optional)",
     "print": "Print"
   },
   "login": {
+    "learnMoreAboutLipi": "Learn more about Lipi",
     "forgotPassword": "Forgot your Password?",
     "dontHaveAccount": "Don't have an account?",
     "login": "LOGIN",
@@ -430,7 +432,7 @@
   },
   "customer": {
     "editCustomerTitle": "Edit Customer",
-    "changeWalletBalanceTip": "Unpaid Change Amount from sales are stoed in Customer Account Balance. You can withdraw it by clicking below.",
+    "changeWalletBalanceTip": "Unpaid Change Amount from sales are stored in Customer Account Balance. You can withdraw it by clicking below.",
     "withdrawFromChangeWalletBalance": "Withdraw",
     "addCustomerTitle": "Add Customer",
     "customerNameInput": "Name of your customer.",
@@ -520,6 +522,7 @@
   "sales": {
     "manageSalesTitle": "Sales Record",
     "salesId": "Sales Number",
+    "salesIdNote": "(Optional. Other Filters will be ignored)",
     "billed": "Billed",
     "paid": "Paid",
     "products": "product(s)",
@@ -732,7 +735,11 @@
     "monetaryUnitDetail": "Note: Changing the monetary unit does not affect your sales.",
     "moreOptionsForthcoming": "More options are forthcoming.",
     "minimumProductQuantity": "Minimum Product Quantity",
-    "minimumProductQuantityDetail": "Product Quantity will be colored Red below this number."
+    "minimumProductQuantityDetail": "Product Quantity will be colored Red below this number.",
+    "defaultPrinterFormat": "Default Printer Format for POS Receipts",
+    "defaultPrinterFormatA4": "A4",
+    "defaultPrinterFormatSlim": "Slim (POS)",
+    "defaultPrinterFormatDetail": "Select Default Printer Format for POS Receipts"
   },
   "verify": {
     "verificationModalTitle": "Verification SMS Sent",
@@ -877,6 +884,7 @@
     "serviceChargeInput": "Service Charge Amount",
     "totalBilled": "Total Billed",
     "paidAmountInput": "Paid Amount",
+    "changeAmount": "Change Amount",
     "dueAmount": "Due amount"
   }
 }
diff --git a/client/src/page-login.html b/client/src/page-login.html
@@ -27,8 +27,8 @@
     }
 
     .lipi-learn-more-link {
-      font-size: 12px;
-      padding-top: 6px;
+      font-size: 14px;
+      padding-top: 8px;
       text-decoration: none;
     }
 
@@ -40,7 +40,7 @@
 
       <div class="logo-learn-more-container vertical layout center">
         <img src="../images/logo.png" class="lipi-logo-image" height="100" width="100">
-        <a class="link primary lipi-learn-more-link" href="https://anvilglobaldynamics.com/lipi" target="_blank">Learn more about Lipi</a>
+        <a class="link primary lipi-learn-more-link" href="https://anvilglobaldynamics.com/lipi" target="_blank">[[verses.login.learnMoreAboutLipi]]</a>
       </div>
 
       <iron-form id="loginForm" on-keypress="genericFormSubmitionKeypress">

diff --git a/client/src/page-manage-sales.html b/client/src/page-manage-sales.html
@@ -49,15 +49,20 @@
         color: red;
       }
 
+      .min-input{
+        min-width: 200px;
+      }
+
     </style>
 
     <elem-not-ready is-ready="[[isReady]]"></elem-not-ready>
 
     <div class$="page layout vertical [[$if(isReady, '', 'hidden')]]" id="wrapper">
 
-      <div class="card horizontal layout center">
-        <paper-input class="flex" value="{{fromDate}}" type="date" label="[[verses.general.fromDate]]"></paper-input>
-        <paper-input class="flex" value="{{toDate}}" type="date" label="[[verses.general.toDate]]"></paper-input>
+      <div class="card horizontal layout center wrap">
+        <paper-input class="flex min-input" value="{{fromDate}}" type="date" label="[[verses.general.fromDate]]"></paper-input>
+        <paper-input class="flex min-input" value="{{toDate}}" type="date" label="[[verses.general.toDate]]"></paper-input>
+        <paper-input class="flex min-input" value="{{salesNumberToSearch}}" label="[[verses.sales.salesId]] [[verses.sales.salesIdNote]]" type="text"></paper-input>
       </div>
 
       <template is="dom-if" if="[[!isSearchingCustomer]]">
@@ -304,6 +309,10 @@
           paginate: this.paginate
         };
 
+        if (this.salesNumberToSearch){
+          data.searchString = this.salesNumberToSearch;
+        }
+
         this.app.callGetSalesListApi(data, (err, response) => {
           if (err) return;
           if (response.hasError) return this.onApiError(response.error);

diff --git a/client/src/page-pos.html b/client/src/page-pos.html
@@ -96,6 +96,10 @@
         margin-top: 16px;
       }
 
+      .m-bottom-18 {
+        margin-bottom: 18px;
+      }
+
       .card.warning {
         background: #FFF59D;
       }
@@ -322,30 +326,33 @@
             </div>
 
             <div class="individual-calculation-field-container">
+              <template is="dom-if" if="[[checkPrivilege('PRIV_ALLOW_FLAT_DISCOUNT')]]">
 
-              <div class="vertical layout">
+                <div class="vertical layout m-bottom-18">
 
-                <paper-dropdown-menu class="full-width-paper-dropdown" label="[[verses.pos.discountType]]" class="mr-4">
-                  <paper-listbox slot="dropdown-content" selected="{{payment.discountType}}" attr-for-selected="name">
-                    <paper-item name="percent">[[verses.general.percentage]]</paper-item>
-                    <paper-item name="fixed">[[verses.general.fixedValue]]</paper-item>
-                  </paper-listbox>
-                </paper-dropdown-menu>
+                  <paper-dropdown-menu class="full-width-paper-dropdown" label="[[verses.pos.discountType]]" class="mr-4">
+                    <paper-listbox slot="dropdown-content" selected="{{payment.discountType}}" attr-for-selected="name">
+                      <paper-item name="percent">[[verses.general.percentage]]</paper-item>
+                      <paper-item name="fixed">[[verses.general.fixedValue]]</paper-item>
+                    </paper-listbox>
+                  </paper-dropdown-menu>
 
-                <template is="dom-if" if="[[$equals(payment.discountType, 'percent')]]">
-                  <paper-input class="payment--discountValue flex" value="{{payment.discountValue}}" on-input="genericPaymentInputChanged" on-change="genericPaymentInputChanged" type="number" required min="0" max="100" error-message="[[verses.pos.discountValueInputError]]" label="[[verses.pos.discountValueInput]]">
-                    <div slot="suffix">%</div>
-                  </paper-input>
-                </template>
-                <template is="dom-if" if="[[$equals(payment.discountType, 'fixed')]]">
-                  <paper-input class="payment--discountValue flex" value="{{payment.discountValue}}" on-input="genericPaymentInputChanged" on-change="genericPaymentInputChanged" type="number" required min="0" max="[[totalBilledCopy]]" error-message="[[verses.pos.discountValueInputError]]" label="[[verses.pos.discountValueInput]]">
-                    <div slot="suffix">[[app.settings.monetaryUnit]]</div>
-                  </paper-input>
-                </template>
+                  <template is="dom-if" if="[[$equals(payment.discountType, 'percent')]]">
+                    <paper-input class="payment--discountValue flex" value="{{payment.discountValue}}" on-input="genericPaymentInputChanged" on-change="genericPaymentInputChanged" type="number" required min="0" max="100" error-message="[[verses.pos.discountValueInputError]]" label="[[verses.pos.discountValueInput]]">
+                      <div slot="suffix">%</div>
+                    </paper-input>
+                  </template>
+                  <template is="dom-if" if="[[$equals(payment.discountType, 'fixed')]]">
+                    <paper-input class="payment--discountValue flex" value="{{payment.discountValue}}" on-input="genericPaymentInputChanged" on-change="genericPaymentInputChanged" type="number" required min="0" max="[[totalBilledCopy]]" error-message="[[verses.pos.discountValueInputError]]" label="[[verses.pos.discountValueInput]]">
+                      <div slot="suffix">[[app.settings.monetaryUnit]]</div>
+                    </paper-input>
+                  </template>
 
-              </div>
+                </div>
+
+              </template>
 
-              <br> [[verses.pos.discountedAmount]]:
+              [[verses.pos.discountedAmount]]:
               <b>{{$round(payment.discountedAmount)}} [[app.settings.monetaryUnit]]</b>
 
             </div>