# HG changeset patch
# User Prakash M <prakash@qualiantech.com>
# Date 1591789391 -19800
#      Wed Jun 10 17:13:11 2020 +0530
# Node ID 760cf22ec9ba9e51b79752c63b025838321b6ed8
# Parent  a0040f171b694322d28ec8953e79421a58424cbe
Fixed BUG-44308: Unable to scan digital coupon barcode without subtype for the
issuing company

* Code for empty subtype is '000000'
* On validating Coupon Code, skipped subtype validation if the subtype code in
coupon is '000000'

diff -r a0040f171b69 -r 760cf22ec9ba web/org.openbravo.retail.chequecadeau/js/chequecadeauutils.js
--- a/web/org.openbravo.retail.chequecadeau/js/chequecadeauutils.js	Wed Mar 25 17:42:26 2020 +0530
+++ b/web/org.openbravo.retail.chequecadeau/js/chequecadeauutils.js	Wed Jun 10 17:13:11 2020 +0530
@@ -102,24 +102,29 @@
             data[0]
           );
 
-          const criteria2 = new OB.App.Class.Criteria()
-            .criterion('issuing_company_id', issuingCompany.get('id'))
-            .criterion('code', coupon.obdicoSubtype);
+          //Code for empty subtype is 000000
+          if (coupon.obdicoSubtype !== '000000') {
+            const criteria2 = new OB.App.Class.Criteria()
+              .criterion('issuing_company_id', issuingCompany.get('id'))
+              .criterion('code', coupon.obdicoSubtype);
 
-          const data2 = await OB.App.MasterdataModels.SubType.find(
-            criteria2.build()
-          );
-          if (data2 && data2.length === 1) {
-            const subType = OB.Dal.transform(OB.Model.SubType, data2[0]);
-            successCallback([issuingCompany, subType]);
+            const data2 = await OB.App.MasterdataModels.SubType.find(
+              criteria2.build()
+            );
+            if (data2 && data2.length === 1) {
+              const subType = OB.Dal.transform(OB.Model.SubType, data2[0]);
+              successCallback([issuingCompany, subType]);
+            } else {
+              errorCallback({
+                onlyOkButton: true,
+                gs1: true,
+                labeli18n: 'CCGS_SubTypeNotFound',
+                message: 'Sub Type code not found for Issuing Company'
+              });
+              return;
+            }
           } else {
-            errorCallback({
-              onlyOkButton: true,
-              gs1: true,
-              labeli18n: 'CCGS_SubTypeNotFound',
-              message: 'Sub Type code not found for Issuing Company'
-            });
-            return;
+            successCallback([issuingCompany]);
           }
         } else {
           errorCallback({