fix bar code scan and validations while search

ShoppinPal · Jan 7, 2020 · d850692 · d850692
1 parent c2cc0a9
commit d850692
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/admin/src/app/home/orders/stock-orders/complete/complete.component.ts b/admin/src/app/home/orders/stock-orders/complete/complete.component.ts
@@ -24,6 +24,7 @@ export class CompleteComponent implements OnInit {
   public totalLineItems: number;
   public sortAscending = true;
   public sortColumn = 'productModelSku';
+  public searchSKUText = '';
 
   constructor(private orgModelApi: OrgModelApi,
               private _route: ActivatedRoute,
@@ -50,8 +51,8 @@ export class CompleteComponent implements OnInit {
       limit = 100;
       skip = 0;
     }
-    if (!productModelIds && productModelIds.length) {
-      this.searchSKUText = ''
+    if ((productModelIds !== undefined && productModelIds !== null) && (!productModelIds && productModelIds.length > 0)) {
+      this.searchSKUText = '';
     }
     let sortOrder = this.sortAscending ? 'ASC' : 'DESC';
     let whereFilter = {
@@ -82,8 +83,8 @@ export class CompleteComponent implements OnInit {
     let countFilter = {
       reportModelId: this.order.id
     };
-    if (productModelId)
-      countFilter['productModelId'] = productModelId;
+    if (productModelIds && productModelIds.length)
+      countFilter['productModelId'] = {inq: productModelIds};
     this.loading = true;
     let fetchLineItems = combineLatest(
       this.orgModelApi.getStockOrderLineitemModels(this.userProfile.orgModelId, filter),

diff --git a/admin/src/app/home/orders/stock-orders/fulfill/fulfill.component.ts b/admin/src/app/home/orders/stock-orders/fulfill/fulfill.component.ts
@@ -91,7 +91,7 @@ export class FulfillComponent implements OnInit {
       limit = 100;
       skip = 0;
     }
-    if (!productModelIds && productModelIds.length) {
+    if ((productModelIds !== undefined && productModelIds !== null) && (!productModelIds && productModelIds.length > 0)) {
       this.searchSKUText = ''
     }
     let sortOrder = this.sortAscending ? 'ASC' : 'DESC';
@@ -157,7 +157,7 @@ export class FulfillComponent implements OnInit {
       limit = 100;
       skip = 0;
     }
-    if (!productModelIds && productModelIds.length) {
+    if ((productModelIds !== undefined && productModelIds !== null) && (!productModelIds && productModelIds.length > 0)) {
       this.searchSKUText = ''
     }
     let sortOrder = this.sortAscending ? 'ASC' : 'DESC';
@@ -397,6 +397,7 @@ export class FulfillComponent implements OnInit {
    */
   barcodeSearchSKU($event: any) {
     if (this.enableBarcode && this.searchSKUText !== '') {
+      console.log("this.searchSKUText  :  ",this.searchSKUText);
       this.searchAndIncrementProduct(this.searchSKUText);
       $event.target.select();
     }

diff --git a/admin/src/app/home/orders/stock-orders/receive/receive.component.ts b/admin/src/app/home/orders/stock-orders/receive/receive.component.ts
@@ -95,7 +95,7 @@ export class ReceiveComponent implements OnInit, OnDestroy {
       limit = 100;
       skip = 0;
     }
-    if (!productModelIds && productModelIds.length) {
+    if ((productModelIds !== undefined && productModelIds !== null) && (!productModelIds && productModelIds.length > 0)) {
       this.searchSKUText = ''
     }
     let sortOrder = this.sortAscending ? 'ASC' : 'DESC';
@@ -160,7 +160,7 @@ export class ReceiveComponent implements OnInit, OnDestroy {
       limit = 100;
       skip = 0;
     }
-    if (!productModelIds && productModelIds.length) {
+    if ((productModelIds !== undefined && productModelIds !== null) && (!productModelIds && productModelIds.length > 0)) {
       this.searchSKUText = ''
     }
     let sortOrder = this.sortAscending ? 'ASC' : 'DESC';

diff --git a/common/models/stock-order-lineitem-model.js b/common/models/stock-order-lineitem-model.js
@@ -35,13 +35,13 @@ module.exports = function (StockOrderLineitemModel) {
             force,
             options
         });
-        let searchPattern = new RegExp(productSku, 'i');
+        // let searchPattern = new RegExp(productSku, 'i');
+        var pattern = new RegExp('.*'+productSku+'.*', "i"); /* case-insensitive RegExp search */
+        var filterData = pattern.toString();
         return StockOrderLineitemModel.app.models.ProductModel.findOne({
             where: {
-                orgModelId,
-                sku: {
-                    like: searchPattern
-                }
+                orgModelId: orgModelId,
+                sku: { "regexp": filterData }
             }
         })
             .catch(function (error) {
@@ -151,7 +151,7 @@ module.exports = function (StockOrderLineitemModel) {
                         });
                         return Promise.all([Promise.resolve({showDiscrepancyAlert: true}), Promise.resolve(orderLineItem.id)]);
                     }
-                }else {
+                } else {
                     logger.debug({
                         functionName: 'scanBarcodeStockOrder',
                         message: 'Force "true" received will increment forcefully',

diff --git a/nginx.warehouse.conf b/nginx.warehouse.conf
@@ -13,7 +13,7 @@ upstream notification-service {
 }
 server {
     listen 80 default;
-    server_name _;
+    server_name shrey.shoppinpal.com;
     # configure real ip if anyone using CloudFlare
     set_real_ip_from 103.21.244.0/22;
     set_real_ip_from 103.22.200.0/22;