0040243: Retail Coupons Improvements - Openbravo Issue Tracking System

diff --git a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/TestIdExtModules.java b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/TestIdExtModules.java --- a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/TestIdExtModules.java +++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/TestIdExtModules.java @@ -628,6 +628,12 @@ "bodyButtons_okButton", EnyoKind.BUTTON); // public static TestIdConstructor BUTTON_COUPONCODE_CLOSE = new TestIdConstructor( "modalInsertCouponCode_headerCloseButton"); // + // Remove Coupon Code + public static TestIdConstructor BUTTON_MENU_COUPONREMOVE = new TestIdConstructor( + "menuScroller_menuRemoveCoupons", EnyoKind.BUTTON); // + public static TestIdConstructor BUTTON_COUPONREMOVE_APPLY = new TestIdConstructor( + "bodyButtons_okRemoveButton", EnyoKind.BUTTON); // + // Service Sequence public static TestIdConstructor BUTTON_SEARCHPRODUCT_SEQ010A = new TestIdConstructor( "seq010a - GPS Nano", EnyoKind.SEARCHPRODUCT); // diff --git a/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/discounts_coupons/I40243_ScanCouponsToAddRemoveFromTicket.java b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/discounts_coupons/I40243_ScanCouponsToAddRemoveFromTicket.java new file mode 100644 --- /dev/null +++ b/src-test/org/openbravo/test/mobile/retail/extmodules/selenium/tests/discounts_coupons/I40243_ScanCouponsToAddRemoveFromTicket.java @@ -0,0 +1,121 @@ +/* + ************************************************************************* + * The contents of this file are subject to the Openbravo Public License + * Version 1.0 (the "License"), being the Mozilla Public License + * Version 1.1 with a permitted attribution clause; you may not use this + * file except in compliance with the License. You may obtain a copy of + * the License at http://www.openbravo.com/legal/license.html + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * The Original Code is Openbravo ERP. + * The Initial Developer of the Original Code is Openbravo S.L.U. + * All portions are Copyright (C) 2019 Openbravo S.L.U. + * All Rights Reserved. + * Contributor(s): + ************************************************************************ + * + * @author EBE + * + */ + +package org.openbravo.test.mobile.retail.extmodules.selenium.tests.discounts_coupons; + +import java.util.Date; + +import org.junit.Test; +import org.openbravo.test.mobile.retail.extmodules.selenium.TestIdExtModules; +import org.openbravo.test.mobile.retail.extmodules.selenium.terminals.WebPOSExtModulesTerminalHelper; +import org.openbravo.test.mobile.retail.mobilecore.database.DatabaseHelperInsertUpdateOrDelete; +import org.openbravo.test.mobile.retail.mobilecore.javascript.EnyoKind; +import org.openbravo.test.mobile.retail.mobilecore.selenium.TestIdConstructor; +import org.openbravo.test.mobile.retail.mobilecore.utils.RetailUtils; +import org.openbravo.test.mobile.retail.pack.selenium.TestIdPack; + +public class I40243_ScanCouponsToAddRemoveFromTicket extends WebPOSExtModulesTerminalHelper { + private final String offerId = "64236DA63E724E88993C8F9CE93602DA"; + private final String offerName = "Coupon 10"; + private final String productCode = "Wilderness wash 100 ml"; + private final String couponCode = "99" + new Date().getTime(); + private final String couponId = RetailUtils.getRandomUUID(); + + @Test + public void test() { + // Add Product + tap(TestIdExtModules.BUTTON_SEARCH); + write(TestIdExtModules.FIELD_SEARCH_TEXT, productCode); + tap(TestIdExtModules.BUTTON_SEARCH_EXECUTE); + tap(TestIdExtModules.BUTTON_SEARCHPRODUCT_FIRSTROW); + verify(TestIdExtModules.LABEL_TOTALTOPAY, "3.90"); + + // Change quantity + tap(TestIdPack.BUTTON_EDIT); + tap(TestIdPack.BUTTON_KEYPAD_2); + tap(TestIdPack.BUTTON_KEYPAD_6); + tap(TestIdPack.BUTTON_KEYPAD_QUANTITY); + verify(TestIdPack.LABEL_TOTALTOPAY, "101.40"); + + // SCAN Coupon + scanCoupon(); + + // Verify Coupon + verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTNAME, "-- " + offerName); + verify(TestIdExtModules.LABEL_RECEIPT_ROW1_DISCOUNTAMOUNT, "-10.00"); + verify(TestIdExtModules.LABEL_TOTALTOPAY, "91.40"); + + // Remove coupon + tap(TestIdExtModules.BUTTON_MENU); + tap(TestIdExtModules.BUTTON_MENU_COUPONREMOVE); + write(TestIdExtModules.LABEL_COUPONCODE, couponCode); + tap(TestIdExtModules.BUTTON_COUPONREMOVE_APPLY); + verify(TestIdPack.LABEL_TOTALTOPAY, "101.40"); + + // Delete Ticket + tap(TestIdExtModules.BUTTON_DELETERECEIPT); + tap(TestIdExtModules.BUTTON_DELETERECEIPT_CONFIRM); + verify(TestIdExtModules.LABEL_TOTALTOPAY, "0.00"); + } + + @Override + public void beforeWithReload() { + String sql = String.format("INSERT INTO obdiscp_coupon(\n" + + " obdiscp_coupon_id, ad_client_id, ad_org_id, isactive, created, \n" + + " createdby, updated, updatedby, couponcode, m_offer_id, status, oneuse)\n" + + "VALUES ('%s', '%s', '%s', 'Y', now(), '100', now(), '100', '%s', '%s', 'NU', 'N')", + couponId, "39363B0921BB4293B48383844325E84C", "67839EEFA49E44AC969BD60093FCC899", couponCode, offerId); + + new DatabaseHelperInsertUpdateOrDelete() { + }.execute(sql, 1); + } + + @Override + public void afterWithReload() { + String sql = String.format("DELETE FROM obdiscp_coupon WHERE obdiscp_coupon_id = '%s'", couponId); + + new DatabaseHelperInsertUpdateOrDelete() { + }.execute(sql, 1); + } + + private void scanCoupon() { + TestIdConstructor[] numbers = new TestIdConstructor[] { + TestIdPack.BUTTON_KEYPAD_0, + TestIdPack.BUTTON_KEYPAD_1, + TestIdPack.BUTTON_KEYPAD_2, + TestIdPack.BUTTON_KEYPAD_3, + TestIdPack.BUTTON_KEYPAD_4, + TestIdPack.BUTTON_KEYPAD_5, + TestIdPack.BUTTON_KEYPAD_6, + TestIdPack.BUTTON_KEYPAD_7, + TestIdPack.BUTTON_KEYPAD_8, + TestIdPack.BUTTON_KEYPAD_9 + }; + + tap(TestIdPack.BUTTON_SCAN); + int zero = Character.getNumericValue('0'); + for (int i = 0; i < couponCode.length(); i++) { + tap(numbers[Character.getNumericValue(couponCode.charAt(i)) - zero]); + } + tap(TestIdPack.BUTTON_KEYPAD_ENTER); + } +}

diff --git a/src-db/database/model/modifiedTables/M_OFFER.xml b/src-db/database/model/modifiedTables/M_OFFER.xml --- a/src-db/database/model/modifiedTables/M_OFFER.xml +++ b/src-db/database/model/modifiedTables/M_OFFER.xml @@ -1,38 +1,6 @@ <?xml version="1.0"?> <database name="MODIFIED TABLE M_OFFER"> <table name="M_OFFER" primaryKey="M_OFFER_KEY"> - <column name="EM_OBDISCP_MONDAY" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"> - <default><![CDATA[N]]></default> - <onCreateDefault/> - </column> - <column name="EM_OBDISCP_TUESDAY" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"> - <default><![CDATA[N]]></default> - <onCreateDefault/> - </column> - <column name="EM_OBDISCP_WEDNESDAY" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"> - <default><![CDATA[N]]></default> - <onCreateDefault/> - </column> - <column name="EM_OBDISCP_THURSDAY" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"> - <default><![CDATA[N]]></default> - <onCreateDefault/> - </column> - <column name="EM_OBDISCP_FRIDAY" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"> - <default><![CDATA[N]]></default> - <onCreateDefault/> - </column> - <column name="EM_OBDISCP_SATURDAY" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"> - <default><![CDATA[N]]></default> - <onCreateDefault/> - </column> - <column name="EM_OBDISCP_SUNDAY" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"> - <default><![CDATA[N]]></default> - <onCreateDefault/> - </column> - <column name="EM_OBDISCP_WHOLEWEEK" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"> - <default><![CDATA[N]]></default> - <onCreateDefault/> - </column> <column name="EM_OBDISCP_ISCOUPON" primaryKey="false" required="false" type="CHAR" size="1" autoIncrement="false"> <default><![CDATA[N]]></default> <onCreateDefault/> @@ -43,12 +11,5 @@ </column> <check name="EM_OBDISCP_OFFER_CLONEOFFER"><![CDATA[EM_OBDISCP_CLONEOFFER IN ('Y', 'N')]]></check> <check name="EM_OBDISCP_OFFER_COUPON_CHK"><![CDATA[EM_OBDISCP_ISCOUPON IN ('Y', 'N')]]></check> - <check name="EM_OBDISCP_OFFER_FRID_CHK"><![CDATA[EM_OBDISCP_FRIDAY IN ('Y', 'N')]]></check> - <check name="EM_OBDISCP_OFFER_MOND_CHK"><![CDATA[EM_OBDISCP_MONDAY IN ('Y', 'N')]]></check> - <check name="EM_OBDISCP_OFFER_SAT_CHK"><![CDATA[EM_OBDISCP_SATURDAY IN ('Y', 'N')]]></check> - <check name="EM_OBDISCP_OFFER_SUN_CHK"><![CDATA[EM_OBDISCP_SUNDAY IN ('Y', 'N')]]></check> - <check name="EM_OBDISCP_OFFER_THURS_CHK"><![CDATA[EM_OBDISCP_THURSDAY IN ('Y', 'N')]]></check> - <check name="EM_OBDISCP_OFFER_TUES_CHK"><![CDATA[EM_OBDISCP_TUESDAY IN ('Y', 'N')]]></check> - <check name="EM_OBDISCP_OFFER_WEDNES_CHK"><![CDATA[EM_OBDISCP_WEDNESDAY IN ('Y', 'N')]]></check> </table> </database> diff --git a/src-db/database/sourcedata/AD_COLUMN.xml b/src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml +++ b/src-db/database/sourcedata/AD_COLUMN.xml @@ -36,45 +36,6 @@  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> </AD_COLUMN> -<AD_COLUMN> - <AD_COLUMN_ID><![CDATA[0728FAFAC4974154A32FCD01FAFEF1C3]]></AD_COLUMN_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <NAME><![CDATA[EM_Obdiscp_Thursday]]></NAME> - <HELP><![CDATA[Allows to redeem the coupon on Thursdays]]></HELP> - <COLUMNNAME><![CDATA[EM_Obdiscp_Thursday]]></COLUMNNAME> - <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID> - <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID> - <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH> - <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE> - <ISKEY><![CDATA[N]]></ISKEY> - <ISPARENT><![CDATA[N]]></ISPARENT> - <ISMANDATORY><![CDATA[N]]></ISMANDATORY> - <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> - <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> - <SEQNO><![CDATA[440]]></SEQNO> - <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> - <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> - <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> - <AD_ELEMENT_ID><![CDATA[38DC9E7FC716492F9CFB32487CD3DB67]]></AD_ELEMENT_ID> - <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> - <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> - <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> - <AD_CALLOUT_ID><![CDATA[92293627F0B1447D831B5D0836DEC7CE]]></AD_CALLOUT_ID> - <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <POSITION><![CDATA[33]]></POSITION> - <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> - <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> - <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> - <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> - <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> - <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> - <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> - <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> -</AD_COLUMN> - <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[0C111B42AAD84E43B223EA6A38349A77]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -114,45 +75,6 @@  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> </AD_COLUMN> -<AD_COLUMN> - <AD_COLUMN_ID><![CDATA[0CC089FBE6F144A881E83C94600C68D5]]></AD_COLUMN_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <NAME><![CDATA[EM_Obdiscp_Saturday]]></NAME> - <HELP><![CDATA[Allows to redeem the coupon on Saturdays]]></HELP> - <COLUMNNAME><![CDATA[EM_Obdiscp_Saturday]]></COLUMNNAME> - <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID> - <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID> - <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH> - <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE> - <ISKEY><![CDATA[N]]></ISKEY> - <ISPARENT><![CDATA[N]]></ISPARENT> - <ISMANDATORY><![CDATA[N]]></ISMANDATORY> - <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> - <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> - <SEQNO><![CDATA[460]]></SEQNO> - <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> - <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> - <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> - <AD_ELEMENT_ID><![CDATA[E10F43D2DFDD496D81665258BA11546D]]></AD_ELEMENT_ID> - <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> - <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> - <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> - <AD_CALLOUT_ID><![CDATA[92293627F0B1447D831B5D0836DEC7CE]]></AD_CALLOUT_ID> - <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <POSITION><![CDATA[35]]></POSITION> - <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> - <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> - <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> - <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> - <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> - <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> - <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> - <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> -</AD_COLUMN> - <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[2544A98525144054B627F5A1F1CEF1F7]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -229,84 +151,6 @@  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> </AD_COLUMN> -<AD_COLUMN> - <AD_COLUMN_ID><![CDATA[3724CD998043451F986D91F93007841E]]></AD_COLUMN_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <NAME><![CDATA[EM_Obdiscp_Sunday]]></NAME> - <HELP><![CDATA[Allows to redeem the coupon on Sundays]]></HELP> - <COLUMNNAME><![CDATA[EM_Obdiscp_Sunday]]></COLUMNNAME> - <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID> - <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID> - <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH> - <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE> - <ISKEY><![CDATA[N]]></ISKEY> - <ISPARENT><![CDATA[N]]></ISPARENT> - <ISMANDATORY><![CDATA[N]]></ISMANDATORY> - <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> - <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> - <SEQNO><![CDATA[470]]></SEQNO> - <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> - <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> - <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> - <AD_ELEMENT_ID><![CDATA[FD4A7DF9442344ADB30BAF4A265909F0]]></AD_ELEMENT_ID> - <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> - <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> - <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> - <AD_CALLOUT_ID><![CDATA[92293627F0B1447D831B5D0836DEC7CE]]></AD_CALLOUT_ID> - <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <POSITION><![CDATA[36]]></POSITION> - <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> - <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> - <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> - <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> - <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> - <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> - <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> - <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> -</AD_COLUMN> - -<AD_COLUMN> - <AD_COLUMN_ID><![CDATA[591A6FA79F044B579FF88FD45ED890D8]]></AD_COLUMN_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <NAME><![CDATA[EM_Obdiscp_Monday]]></NAME> - <HELP><![CDATA[Allows to redeem the coupon on Mondays]]></HELP> - <COLUMNNAME><![CDATA[EM_Obdiscp_Monday]]></COLUMNNAME> - <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID> - <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID> - <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH> - <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE> - <ISKEY><![CDATA[N]]></ISKEY> - <ISPARENT><![CDATA[N]]></ISPARENT> - <ISMANDATORY><![CDATA[N]]></ISMANDATORY> - <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> - <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> - <SEQNO><![CDATA[410]]></SEQNO> - <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> - <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> - <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> - <AD_ELEMENT_ID><![CDATA[13BE916E8C9640309BDD5654C3FA4333]]></AD_ELEMENT_ID> - <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> - <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> - <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> - <AD_CALLOUT_ID><![CDATA[92293627F0B1447D831B5D0836DEC7CE]]></AD_CALLOUT_ID> - <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <POSITION><![CDATA[30]]></POSITION> - <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> - <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> - <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> - <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> - <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> - <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> - <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> - <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> -</AD_COLUMN> - <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[5C03C21EA8634721B7D415FBE9531173]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -387,84 +231,6 @@  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> </AD_COLUMN> -<AD_COLUMN> - <AD_COLUMN_ID><![CDATA[68FB0B306A8942E4AEDBA7132242E34E]]></AD_COLUMN_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <NAME><![CDATA[EM_Obdiscp_Tuesday]]></NAME> - <HELP><![CDATA[Allows to redeem the coupon on Tuesdays]]></HELP> - <COLUMNNAME><![CDATA[EM_Obdiscp_Tuesday]]></COLUMNNAME> - <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID> - <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID> - <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH> - <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE> - <ISKEY><![CDATA[N]]></ISKEY> - <ISPARENT><![CDATA[N]]></ISPARENT> - <ISMANDATORY><![CDATA[N]]></ISMANDATORY> - <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> - <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> - <SEQNO><![CDATA[420]]></SEQNO> - <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> - <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> - <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> - <AD_ELEMENT_ID><![CDATA[34B6251D632A4B3CB18A4C9EE278A243]]></AD_ELEMENT_ID> - <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> - <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> - <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> - <AD_CALLOUT_ID><![CDATA[92293627F0B1447D831B5D0836DEC7CE]]></AD_CALLOUT_ID> - <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <POSITION><![CDATA[31]]></POSITION> - <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> - <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> - <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> - <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> - <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> - <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> - <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> - <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> -</AD_COLUMN> - -<AD_COLUMN> - <AD_COLUMN_ID><![CDATA[71CA1670BF8142A98190C8863B588FBF]]></AD_COLUMN_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <NAME><![CDATA[EM_Obdiscp_Friday]]></NAME> - <HELP><![CDATA[Allows to redeem the coupon on Fridays]]></HELP> - <COLUMNNAME><![CDATA[EM_Obdiscp_Friday]]></COLUMNNAME> - <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID> - <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID> - <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH> - <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE> - <ISKEY><![CDATA[N]]></ISKEY> - <ISPARENT><![CDATA[N]]></ISPARENT> - <ISMANDATORY><![CDATA[N]]></ISMANDATORY> - <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> - <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> - <SEQNO><![CDATA[450]]></SEQNO> - <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> - <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> - <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> - <AD_ELEMENT_ID><![CDATA[EA17BE73B8CD4FBC91528E7BC27F161A]]></AD_ELEMENT_ID> - <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> - <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> - <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> - <AD_CALLOUT_ID><![CDATA[92293627F0B1447D831B5D0836DEC7CE]]></AD_CALLOUT_ID> - <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <POSITION><![CDATA[34]]></POSITION> - <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> - <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> - <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> - <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> - <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> - <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> - <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> - <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> -</AD_COLUMN> - <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[7A40B2DEDBFE454DAF08A6F40EFDDB25]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -530,7 +296,7 @@  <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE>  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>  <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <POSITION><![CDATA[52]]></POSITION> + <POSITION><![CDATA[51]]></POSITION>  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> @@ -580,45 +346,6 @@  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> </AD_COLUMN> -<AD_COLUMN> - <AD_COLUMN_ID><![CDATA[AA8851111B934785B2A2694479D9031C]]></AD_COLUMN_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <NAME><![CDATA[EM_Obdiscp_Wholeweek]]></NAME> - <HELP><![CDATA[Allows to redeem the coupon the whole week]]></HELP> - <COLUMNNAME><![CDATA[EM_Obdiscp_Wholeweek]]></COLUMNNAME> - <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID> - <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID> - <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH> - <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE> - <ISKEY><![CDATA[N]]></ISKEY> - <ISPARENT><![CDATA[N]]></ISPARENT> - <ISMANDATORY><![CDATA[N]]></ISMANDATORY> - <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> - <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> - <SEQNO><![CDATA[480]]></SEQNO> - <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> - <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> - <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> - <AD_ELEMENT_ID><![CDATA[AA7EAEDA1FC1458289A96140174F4630]]></AD_ELEMENT_ID> - <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> - <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> - <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> - <AD_CALLOUT_ID><![CDATA[92293627F0B1447D831B5D0836DEC7CE]]></AD_CALLOUT_ID> - <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <POSITION><![CDATA[37]]></POSITION> - <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> - <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> - <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> - <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> - <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> - <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> - <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> - <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> -</AD_COLUMN> - <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[AAFB6C30A3CC4862832410516AF40694]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -725,7 +452,7 @@  <AD_CALLOUT_ID><![CDATA[92293627F0B1447D831B5D0836DEC7CE]]></AD_CALLOUT_ID>  <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS>  <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <POSITION><![CDATA[38]]></POSITION> + <POSITION><![CDATA[50]]></POSITION>  <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT>  <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE>  <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> @@ -774,45 +501,6 @@  <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> </AD_COLUMN> -<AD_COLUMN> - <AD_COLUMN_ID><![CDATA[EB3A08B257054DF18014C809BA15054A]]></AD_COLUMN_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <NAME><![CDATA[EM_Obdiscp_Wednesday]]></NAME> - <HELP><![CDATA[Allows to redeem the coupon on Wednesday]]></HELP> - <COLUMNNAME><![CDATA[EM_Obdiscp_Wednesday]]></COLUMNNAME> - <AD_TABLE_ID><![CDATA[800062]]></AD_TABLE_ID> - <AD_REFERENCE_ID><![CDATA[20]]></AD_REFERENCE_ID> - <FIELDLENGTH><![CDATA[1]]></FIELDLENGTH> - <DEFAULTVALUE><![CDATA[N]]></DEFAULTVALUE> - <ISKEY><![CDATA[N]]></ISKEY> - <ISPARENT><![CDATA[N]]></ISPARENT> - <ISMANDATORY><![CDATA[N]]></ISMANDATORY> - <ISUPDATEABLE><![CDATA[Y]]></ISUPDATEABLE> - <ISIDENTIFIER><![CDATA[N]]></ISIDENTIFIER> - <SEQNO><![CDATA[430]]></SEQNO> - <ISTRANSLATED><![CDATA[N]]></ISTRANSLATED> - <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> - <ISSELECTIONCOLUMN><![CDATA[N]]></ISSELECTIONCOLUMN> - <AD_ELEMENT_ID><![CDATA[134E8E8BE15D4C1E9B9EA52FF04C4871]]></AD_ELEMENT_ID> - <ISSESSIONATTR><![CDATA[N]]></ISSESSIONATTR> - <ISSECONDARYKEY><![CDATA[N]]></ISSECONDARYKEY> - <ISDESENCRYPTABLE><![CDATA[N]]></ISDESENCRYPTABLE> - <AD_CALLOUT_ID><![CDATA[92293627F0B1447D831B5D0836DEC7CE]]></AD_CALLOUT_ID> - <DEVELOPMENTSTATUS><![CDATA[RE]]></DEVELOPMENTSTATUS> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <POSITION><![CDATA[32]]></POSITION> - <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> - <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> - <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> - <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> - <ISUSEDSEQUENCE><![CDATA[N]]></ISUSEDSEQUENCE> - <ALLOWSORTING><![CDATA[Y]]></ALLOWSORTING> - <ALLOWFILTERING><![CDATA[Y]]></ALLOWFILTERING> - <ALLOWED_CROSS_ORG_LINK><![CDATA[N]]></ALLOWED_CROSS_ORG_LINK> -</AD_COLUMN> - <AD_COLUMN>  <AD_COLUMN_ID><![CDATA[EED062552DA74759B1DB208EBB129613]]></AD_COLUMN_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src-db/database/sourcedata/AD_ELEMENT.xml b/src-db/database/sourcedata/AD_ELEMENT.xml --- a/src-db/database/sourcedata/AD_ELEMENT.xml +++ b/src-db/database/sourcedata/AD_ELEMENT.xml @@ -12,58 +12,6 @@  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> </AD_ELEMENT> -<AD_ELEMENT> - <AD_ELEMENT_ID><![CDATA[134E8E8BE15D4C1E9B9EA52FF04C4871]]></AD_ELEMENT_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <COLUMNNAME><![CDATA[EM_Obdiscp_Wednesday]]></COLUMNNAME> - <NAME><![CDATA[Wednesday]]></NAME> - <PRINTNAME><![CDATA[Wednesday]]></PRINTNAME> - <HELP><![CDATA[Allows to redeem the coupon on Wednesday]]></HELP> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> -</AD_ELEMENT> - -<AD_ELEMENT> - <AD_ELEMENT_ID><![CDATA[13BE916E8C9640309BDD5654C3FA4333]]></AD_ELEMENT_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <COLUMNNAME><![CDATA[EM_Obdiscp_Monday]]></COLUMNNAME> - <NAME><![CDATA[Monday]]></NAME> - <PRINTNAME><![CDATA[Monday]]></PRINTNAME> - <HELP><![CDATA[Allows to redeem the coupon on Mondays]]></HELP> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> -</AD_ELEMENT> - -<AD_ELEMENT> - <AD_ELEMENT_ID><![CDATA[34B6251D632A4B3CB18A4C9EE278A243]]></AD_ELEMENT_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <COLUMNNAME><![CDATA[EM_Obdiscp_Tuesday]]></COLUMNNAME> - <NAME><![CDATA[Tuesday]]></NAME> - <PRINTNAME><![CDATA[Tuesday]]></PRINTNAME> - <HELP><![CDATA[Allows to redeem the coupon on Tuesdays]]></HELP> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> -</AD_ELEMENT> - -<AD_ELEMENT> - <AD_ELEMENT_ID><![CDATA[38DC9E7FC716492F9CFB32487CD3DB67]]></AD_ELEMENT_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <COLUMNNAME><![CDATA[EM_Obdiscp_Thursday]]></COLUMNNAME> - <NAME><![CDATA[Thursday]]></NAME> - <PRINTNAME><![CDATA[Thursday]]></PRINTNAME> - <HELP><![CDATA[Allows to redeem the coupon on Thursdays]]></HELP> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> -</AD_ELEMENT> - <AD_ELEMENT>  <AD_ELEMENT_ID><![CDATA[74A50C5EB6194DB0A0D7607E673C24FF]]></AD_ELEMENT_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -118,19 +66,6 @@  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> </AD_ELEMENT> -<AD_ELEMENT> - <AD_ELEMENT_ID><![CDATA[AA7EAEDA1FC1458289A96140174F4630]]></AD_ELEMENT_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <COLUMNNAME><![CDATA[EM_Obdiscp_Wholeweek]]></COLUMNNAME> - <NAME><![CDATA[All]]></NAME> - <PRINTNAME><![CDATA[All]]></PRINTNAME> - <HELP><![CDATA[Allows to redeem the coupon the whole week]]></HELP> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> -</AD_ELEMENT> - <AD_ELEMENT>  <AD_ELEMENT_ID><![CDATA[B51BD6F7AC5949BEB6DB74AF079C21D1]]></AD_ELEMENT_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -144,45 +79,6 @@  <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> </AD_ELEMENT> -<AD_ELEMENT> - <AD_ELEMENT_ID><![CDATA[E10F43D2DFDD496D81665258BA11546D]]></AD_ELEMENT_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <COLUMNNAME><![CDATA[EM_Obdiscp_Saturday]]></COLUMNNAME> - <NAME><![CDATA[Saturday]]></NAME> - <PRINTNAME><![CDATA[Saturday]]></PRINTNAME> - <HELP><![CDATA[Allows to redeem the coupon on Saturdays]]></HELP> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> -</AD_ELEMENT> - -<AD_ELEMENT> - <AD_ELEMENT_ID><![CDATA[EA17BE73B8CD4FBC91528E7BC27F161A]]></AD_ELEMENT_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <COLUMNNAME><![CDATA[EM_Obdiscp_Friday]]></COLUMNNAME> - <NAME><![CDATA[Friday]]></NAME> - <PRINTNAME><![CDATA[Friday]]></PRINTNAME> - <HELP><![CDATA[Allows to redeem the coupon on Fridays]]></HELP> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> -</AD_ELEMENT> - -<AD_ELEMENT> - <AD_ELEMENT_ID><![CDATA[FD4A7DF9442344ADB30BAF4A265909F0]]></AD_ELEMENT_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <COLUMNNAME><![CDATA[EM_Obdiscp_Sunday]]></COLUMNNAME> - <NAME><![CDATA[Sunday]]></NAME> - <PRINTNAME><![CDATA[Sunday]]></PRINTNAME> - <HELP><![CDATA[Allows to redeem the coupon on Sundays]]></HELP> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <ISGLOSSARY><![CDATA[N]]></ISGLOSSARY> -</AD_ELEMENT> - <AD_ELEMENT>  <AD_ELEMENT_ID><![CDATA[FE50E0B36FAF4253B35DE65D3119B805]]></AD_ELEMENT_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src-db/database/sourcedata/AD_FIELD.xml b/src-db/database/sourcedata/AD_FIELD.xml --- a/src-db/database/sourcedata/AD_FIELD.xml +++ b/src-db/database/sourcedata/AD_FIELD.xml @@ -1,33 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> <data> -<AD_FIELD> - <AD_FIELD_ID><![CDATA[02765BD57FCE4095BC1825B3F2F16A06]]></AD_FIELD_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <NAME><![CDATA[Thursday]]></NAME> - <HELP><![CDATA[Allows to redeem the coupon on Thursdays]]></HELP> - <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> - <AD_TAB_ID><![CDATA[800079]]></AD_TAB_ID> - <AD_COLUMN_ID><![CDATA[0728FAFAC4974154A32FCD01FAFEF1C3]]></AD_COLUMN_ID> - <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> - <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> - <DISPLAYLOGIC><![CDATA[@EM_Obdiscp_Iscoupon@='Y']]></DISPLAYLOGIC> - <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> - <ISREADONLY><![CDATA[N]]></ISREADONLY> - <SEQNO><![CDATA[400]]></SEQNO> - <ISSAMELINE><![CDATA[N]]></ISSAMELINE> - <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> - <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> - <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> - <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> - <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> - <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> - <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> -</AD_FIELD> - <AD_FIELD>  <AD_FIELD_ID><![CDATA[0FE4899604114EE2B50B0B1A51A214D3]]></AD_FIELD_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -166,34 +138,6 @@  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> </AD_FIELD> -<AD_FIELD> - <AD_FIELD_ID><![CDATA[39DAD7F19E304F658A4E0DF64665CAF5]]></AD_FIELD_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <NAME><![CDATA[Friday]]></NAME> - <HELP><![CDATA[Allows to redeem the coupon on Fridays]]></HELP> - <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> - <AD_TAB_ID><![CDATA[800079]]></AD_TAB_ID> - <AD_COLUMN_ID><![CDATA[71CA1670BF8142A98190C8863B588FBF]]></AD_COLUMN_ID> - <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> - <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> - <DISPLAYLOGIC><![CDATA[@EM_Obdiscp_Iscoupon@='Y']]></DISPLAYLOGIC> - <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> - <ISREADONLY><![CDATA[N]]></ISREADONLY> - <SEQNO><![CDATA[410]]></SEQNO> - <ISSAMELINE><![CDATA[N]]></ISSAMELINE> - <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> - <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> - <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> - <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> - <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> - <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> - <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> -</AD_FIELD> - <AD_FIELD>  <AD_FIELD_ID><![CDATA[4777ED55B8364A778BDE5B6980B40740]]></AD_FIELD_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -248,63 +192,6 @@  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> </AD_FIELD> -<AD_FIELD> - <AD_FIELD_ID><![CDATA[68EE400515DE4824B9E9B673C794D5FC]]></AD_FIELD_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <NAME><![CDATA[Saturday]]></NAME> - <HELP><![CDATA[Allows to redeem the coupon on Saturdays]]></HELP> - <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> - <AD_TAB_ID><![CDATA[800079]]></AD_TAB_ID> - <AD_COLUMN_ID><![CDATA[0CC089FBE6F144A881E83C94600C68D5]]></AD_COLUMN_ID> - <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> - <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> - <DISPLAYLOGIC><![CDATA[@EM_Obdiscp_Iscoupon@='Y']]></DISPLAYLOGIC> - <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> - <ISREADONLY><![CDATA[N]]></ISREADONLY> - <SEQNO><![CDATA[420]]></SEQNO> - <ISSAMELINE><![CDATA[N]]></ISSAMELINE> - <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> - <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> - <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> - <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> - <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> - <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> - <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> -</AD_FIELD> - -<AD_FIELD> - <AD_FIELD_ID><![CDATA[815FB4F845F04EE6A42995D00A88C316]]></AD_FIELD_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <NAME><![CDATA[All]]></NAME> - <HELP><![CDATA[Allows to redeem the coupon the whole week]]></HELP> - <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> - <AD_TAB_ID><![CDATA[800079]]></AD_TAB_ID> - <AD_COLUMN_ID><![CDATA[AA8851111B934785B2A2694479D9031C]]></AD_COLUMN_ID> - <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> - <AD_FIELDGROUP_ID><![CDATA[1492AD7687604498A488DBA200B2313B]]></AD_FIELDGROUP_ID> - <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> - <DISPLAYLOGIC><![CDATA[@EM_Obdiscp_Iscoupon@='Y']]></DISPLAYLOGIC> - <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> - <ISREADONLY><![CDATA[N]]></ISREADONLY> - <SEQNO><![CDATA[360]]></SEQNO> - <ISSAMELINE><![CDATA[N]]></ISSAMELINE> - <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> - <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> - <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> - <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> - <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> - <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> - <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> -</AD_FIELD> - <AD_FIELD>  <AD_FIELD_ID><![CDATA[87C3DB3FE1344FC69A1B112CFB974129]]></AD_FIELD_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -361,34 +248,6 @@  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> </AD_FIELD> -<AD_FIELD> - <AD_FIELD_ID><![CDATA[AF65A124AAFB45FE831B6D65F872C86C]]></AD_FIELD_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <NAME><![CDATA[Wednesday]]></NAME> - <HELP><![CDATA[Allows to redeem the coupon on Wednesday]]></HELP> - <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> - <AD_TAB_ID><![CDATA[800079]]></AD_TAB_ID> - <AD_COLUMN_ID><![CDATA[EB3A08B257054DF18014C809BA15054A]]></AD_COLUMN_ID> - <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> - <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> - <DISPLAYLOGIC><![CDATA[@EM_Obdiscp_Iscoupon@='Y']]></DISPLAYLOGIC> - <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> - <ISREADONLY><![CDATA[N]]></ISREADONLY> - <SEQNO><![CDATA[390]]></SEQNO> - <ISSAMELINE><![CDATA[N]]></ISSAMELINE> - <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> - <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> - <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> - <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> - <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> - <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> - <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> -</AD_FIELD> - <AD_FIELD>  <AD_FIELD_ID><![CDATA[B30D78B572FC4C488D871C3B214F97A2]]></AD_FIELD_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -418,34 +277,6 @@  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> </AD_FIELD> -<AD_FIELD> - <AD_FIELD_ID><![CDATA[B5CFAA95EA844E34B862A92D321AD5D2]]></AD_FIELD_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <NAME><![CDATA[Monday]]></NAME> - <HELP><![CDATA[Allows to redeem the coupon on Mondays]]></HELP> - <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> - <AD_TAB_ID><![CDATA[800079]]></AD_TAB_ID> - <AD_COLUMN_ID><![CDATA[591A6FA79F044B579FF88FD45ED890D8]]></AD_COLUMN_ID> - <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> - <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> - <DISPLAYLOGIC><![CDATA[@EM_Obdiscp_Iscoupon@='Y']]></DISPLAYLOGIC> - <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> - <ISREADONLY><![CDATA[N]]></ISREADONLY> - <SEQNO><![CDATA[370]]></SEQNO> - <ISSAMELINE><![CDATA[N]]></ISSAMELINE> - <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> - <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> - <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> - <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> - <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> - <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> - <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> -</AD_FIELD> - <AD_FIELD>  <AD_FIELD_ID><![CDATA[C99032C8471548399B27A52E996D4FC0]]></AD_FIELD_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -558,34 +389,6 @@  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> </AD_FIELD> -<AD_FIELD> - <AD_FIELD_ID><![CDATA[EE894EE23B6144D0A535E388F764F518]]></AD_FIELD_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <NAME><![CDATA[Tuesday]]></NAME> - <HELP><![CDATA[Allows to redeem the coupon on Tuesdays]]></HELP> - <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> - <AD_TAB_ID><![CDATA[800079]]></AD_TAB_ID> - <AD_COLUMN_ID><![CDATA[68FB0B306A8942E4AEDBA7132242E34E]]></AD_COLUMN_ID> - <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> - <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> - <DISPLAYLOGIC><![CDATA[@EM_Obdiscp_Iscoupon@='Y']]></DISPLAYLOGIC> - <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> - <ISREADONLY><![CDATA[N]]></ISREADONLY> - <SEQNO><![CDATA[380]]></SEQNO> - <ISSAMELINE><![CDATA[N]]></ISSAMELINE> - <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> - <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> - <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> - <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> - <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> - <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> - <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> -</AD_FIELD> - <AD_FIELD>  <AD_FIELD_ID><![CDATA[F2661BC3658745C5A5DBD5898C21B52C]]></AD_FIELD_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -614,32 +417,4 @@  <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> </AD_FIELD> -<AD_FIELD> - <AD_FIELD_ID><![CDATA[F6F84A2A530540528ACBD55FF46D9EEB]]></AD_FIELD_ID> - <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> - <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> - <ISACTIVE><![CDATA[Y]]></ISACTIVE> - <NAME><![CDATA[Sunday]]></NAME> - <HELP><![CDATA[Allows to redeem the coupon on Sundays]]></HELP> - <ISCENTRALLYMAINTAINED><![CDATA[Y]]></ISCENTRALLYMAINTAINED> - <AD_TAB_ID><![CDATA[800079]]></AD_TAB_ID> - <AD_COLUMN_ID><![CDATA[3724CD998043451F986D91F93007841E]]></AD_COLUMN_ID> - <IGNOREINWAD><![CDATA[N]]></IGNOREINWAD> - <ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED> - <DISPLAYLOGIC><![CDATA[@EM_Obdiscp_Iscoupon@='Y']]></DISPLAYLOGIC> - <DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH> - <ISREADONLY><![CDATA[N]]></ISREADONLY> - <SEQNO><![CDATA[430]]></SEQNO> - <ISSAMELINE><![CDATA[N]]></ISSAMELINE> - <ISFIELDONLY><![CDATA[N]]></ISFIELDONLY> - <ISENCRYPTED><![CDATA[N]]></ISENCRYPTED> - <SHOWINRELATION><![CDATA[N]]></SHOWINRELATION> - <ISFIRSTFOCUSEDFIELD><![CDATA[N]]></ISFIRSTFOCUSEDFIELD> - <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> - <STARTINODDCOLUMN><![CDATA[N]]></STARTINODDCOLUMN> - <STARTNEWLINE><![CDATA[N]]></STARTNEWLINE> - <ISSHOWNINSTATUSBAR><![CDATA[N]]></ISSHOWNINSTATUSBAR> - <EM_OBUIAPP_SHOWSUMMARY><![CDATA[N]]></EM_OBUIAPP_SHOWSUMMARY> -</AD_FIELD> - </data> diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml --- a/src-db/database/sourcedata/AD_MESSAGE.xml +++ b/src-db/database/sourcedata/AD_MESSAGE.xml @@ -36,6 +36,18 @@  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> </AD_MESSAGE> +<AD_MESSAGE> + <AD_MESSAGE_ID><![CDATA[4C73F0ADE8104D4AB55DA158B4B2DE5D]]></AD_MESSAGE_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <VALUE><![CDATA[OBDISCP_CodeNotFound]]></VALUE> + <MSGTEXT><![CDATA[Coupon Code not found]]></MSGTEXT> + <MSGTYPE><![CDATA[E]]></MSGTYPE> + <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> + <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +</AD_MESSAGE> + <AD_MESSAGE>  <AD_MESSAGE_ID><![CDATA[4CC7D68EA9CD4680B55883715002BB60]]></AD_MESSAGE_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -72,6 +84,18 @@  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> </AD_MESSAGE> +<AD_MESSAGE> + <AD_MESSAGE_ID><![CDATA[93F5FE8D10BE46ADACD1F6A58762C295]]></AD_MESSAGE_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <VALUE><![CDATA[OBDISCP_InvalidCodes]]></VALUE> + <MSGTEXT><![CDATA[The following Coupons have already been used]]></MSGTEXT> + <MSGTYPE><![CDATA[E]]></MSGTYPE> + <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> + <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +</AD_MESSAGE> + <AD_MESSAGE>  <AD_MESSAGE_ID><![CDATA[9463262F257E4FD4A9F79F2D539150D0]]></AD_MESSAGE_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -84,6 +108,18 @@  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> </AD_MESSAGE> +<AD_MESSAGE> + <AD_MESSAGE_ID><![CDATA[98E909437A75454D953AE7AB1F85F993]]></AD_MESSAGE_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <VALUE><![CDATA[OBDISCP_RemoveCoupon]]></VALUE> + <MSGTEXT><![CDATA[Remove coupon from ticket]]></MSGTEXT> + <MSGTYPE><![CDATA[I]]></MSGTYPE> + <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> + <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +</AD_MESSAGE> + <AD_MESSAGE>  <AD_MESSAGE_ID><![CDATA[A6D520FD8A16434485AA6085F866CEA1]]></AD_MESSAGE_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> @@ -96,6 +132,18 @@  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> </AD_MESSAGE> +<AD_MESSAGE> + <AD_MESSAGE_ID><![CDATA[B9A664A0DDB645FE88608FE1F034986F]]></AD_MESSAGE_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <VALUE><![CDATA[OBDISCP_CouponcodeRemove]]></VALUE> + <MSGTEXT><![CDATA[Coupon Code To Remove]]></MSGTEXT> + <MSGTYPE><![CDATA[I]]></MSGTYPE> + <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> + <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N> +</AD_MESSAGE> + <AD_MESSAGE>  <AD_MESSAGE_ID><![CDATA[BD0D24B595F7414C91DC892599ED63E4]]></AD_MESSAGE_ID>  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> diff --git a/src-db/database/sourcedata/OBMOBC_SERVICES.xml b/src-db/database/sourcedata/OBMOBC_SERVICES.xml --- a/src-db/database/sourcedata/OBMOBC_SERVICES.xml +++ b/src-db/database/sourcedata/OBMOBC_SERVICES.xml @@ -26,4 +26,17 @@  <SERVER_RUNTIME><![CDATA[OBSTSYN_ON_CENTRAL]]></SERVER_RUNTIME> </OBMOBC_SERVICES> +<OBMOBC_SERVICES> + <OBMOBC_SERVICES_ID><![CDATA[B1491EED75124EB7A4556BDFE2181C18]]></OBMOBC_SERVICES_ID> + <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID> + <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> + <AD_MODULE_ID><![CDATA[4AB4092C7BAD40E5942E674872C92834]]></AD_MODULE_ID> + <ISACTIVE><![CDATA[Y]]></ISACTIVE> + <SERVICE><![CDATA[org.openbravo.retail.discounts.coupons.CouponAvailability]]></SERVICE> + <DESCRIPTION><![CDATA[Checks the availability of the coupon]]></DESCRIPTION> + <ROUTINGTYPE><![CDATA[Failover]]></ROUTINGTYPE> + <DEFAULTTIMEOUT><![CDATA[15]]></DEFAULTTIMEOUT> + <SERVER_RUNTIME><![CDATA[OBSTSYN_ON_CENTRAL]]></SERVER_RUNTIME> +</OBMOBC_SERVICES> + </data> diff --git a/src/org/openbravo/retail/discounts/coupons/CouponAvailability.java b/src/org/openbravo/retail/discounts/coupons/CouponAvailability.java new file mode 100644 --- /dev/null +++ b/src/org/openbravo/retail/discounts/coupons/CouponAvailability.java @@ -0,0 +1,127 @@ +/* + ************************************************************************************ + * Copyright (C) 2014-2019 Openbravo S.L.U. + * Licensed under the Openbravo Commercial License version 1.0 + * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html + * or in the legal folder of this module distribution. + ************************************************************************************ + */ + +package org.openbravo.retail.discounts.coupons; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +import javax.servlet.ServletException; + +import org.codehaus.jettison.json.JSONException; +import org.codehaus.jettison.json.JSONObject; +import org.hibernate.criterion.Restrictions; +import org.openbravo.dal.core.OBContext; +import org.openbravo.dal.service.OBCriteria; +import org.openbravo.dal.service.OBDal; +import org.openbravo.model.pricing.priceadjustment.PriceAdjustment; +import org.openbravo.retail.posterminal.JSONProcessSimple; + +public class CouponAvailability extends JSONProcessSimple { + @Override + public JSONObject exec(JSONObject jsonData) throws JSONException, ServletException { + String couponCode; + OBContext.setAdminMode(true); + JSONObject result = new JSONObject(); + + try { + couponCode = jsonData.getString("couponId"); + OBCriteria<Coupon> criteria = OBDal.getInstance().createCriteria(Coupon.class); + criteria.setMaxResults(1); + criteria.add(Restrictions.eq(Coupon.PROPERTY_COUPONCODE, couponCode)); + Coupon coupon = (Coupon) criteria.uniqueResult(); + boolean isValid = isValidDiscount(coupon, jsonData); + if ("NU".equals(coupon.getStatus()) && isValid) { + result.put("couponCode", couponCode); + result.put("used", false); + result.put("id", coupon.getId()); + result.put("promotionDiscount", coupon.getPromotionDiscount().getId()); + } else { + result.put("used", true); + result.put("isValid", isValid); + } + + } catch (Exception e) { + JSONObject finalResult = new JSONObject(); + result.put("message", e.getMessage()); + finalResult.put("data", result); + finalResult.put("status", -1); + return finalResult; + } finally { + OBContext.restorePreviousMode(); + } + JSONObject finalResult = new JSONObject(); + finalResult.put("data", result); + finalResult.put("status", 0); + return finalResult; + } + + private boolean isValidDiscount(Coupon coupon, JSONObject jsonData) + throws ParseException, JSONException { + SimpleDateFormat timeFormatter = new SimpleDateFormat("yyyy-MM-DD HH:mm:ss"); + Date clientTime = timeFormatter.parse(jsonData.getString("time")); + String weekdayPropertyName = PriceAdjustment.PROPERTY_ALLWEEKDAYS; + String startingTimePropertyName = PriceAdjustment.PROPERTY_STARTINGTIME; + String endingTimePropertyName = PriceAdjustment.PROPERTY_ENDINGTIME; + PriceAdjustment promotion = coupon.getPromotionDiscount(); + if (!promotion.isAllweekdays()) { + switch (jsonData.getInt("day")) { + case 1: + weekdayPropertyName = PriceAdjustment.PROPERTY_MONDAY; + startingTimePropertyName = PriceAdjustment.PROPERTY_STARTINGTIMEMONDAY; + endingTimePropertyName = PriceAdjustment.PROPERTY_ENDINGTIMEMONDAY; + break; + case 2: + weekdayPropertyName = PriceAdjustment.PROPERTY_TUESDAY; + startingTimePropertyName = PriceAdjustment.PROPERTY_STARTINGTIMETUESDAY; + endingTimePropertyName = PriceAdjustment.PROPERTY_ENDINGTIMETUESDAY; + break; + case 3: + weekdayPropertyName = PriceAdjustment.PROPERTY_WEDNESDAY; + startingTimePropertyName = PriceAdjustment.PROPERTY_STARTINGTIMEWEDNESDAY; + endingTimePropertyName = PriceAdjustment.PROPERTY_ENDINGTIMEWEDNESDAY; + break; + case 4: + weekdayPropertyName = PriceAdjustment.PROPERTY_THURSDAY; + startingTimePropertyName = PriceAdjustment.PROPERTY_STARTINGTIMETHURSDAY; + endingTimePropertyName = PriceAdjustment.PROPERTY_ENDINGTIMETHURSDAY; + break; + case 5: + weekdayPropertyName = PriceAdjustment.PROPERTY_FRIDAY; + startingTimePropertyName = PriceAdjustment.PROPERTY_STARTINGTIMEFRIDAY; + endingTimePropertyName = PriceAdjustment.PROPERTY_ENDINGTIMEFRIDAY; + break; + case 6: + weekdayPropertyName = PriceAdjustment.PROPERTY_SATURDAY; + startingTimePropertyName = PriceAdjustment.PROPERTY_STARTINGTIMESATURDAY; + endingTimePropertyName = PriceAdjustment.PROPERTY_ENDINGTIMESATURDAY; + break; + case 0: + weekdayPropertyName = PriceAdjustment.PROPERTY_SUNDAY; + startingTimePropertyName = PriceAdjustment.PROPERTY_STARTINGTIMESUNDAY; + endingTimePropertyName = PriceAdjustment.PROPERTY_ENDINGTIMESUNDAY; + break; + } + } + return (Boolean) promotion.get(weekdayPropertyName) + && ((promotion.get(startingTimePropertyName) == null + && promotion.get(endingTimePropertyName) == null) + || ((promotion.get(startingTimePropertyName) != null + && promotion.get(endingTimePropertyName) != null + && ((Date) promotion.get(startingTimePropertyName)).before(clientTime) + && ((Date) promotion.get(endingTimePropertyName)).after(clientTime)) + || (promotion.get(startingTimePropertyName) != null + && ((Date) promotion.get(startingTimePropertyName)).before(clientTime) + && promotion.get(endingTimePropertyName) == null + || (promotion.get(endingTimePropertyName) != null + && promotion.get(startingTimePropertyName) == null + && ((Date) promotion.get(endingTimePropertyName)).after(clientTime))))); + } +} \ No newline at end of file diff --git a/src/org/openbravo/retail/discounts/coupons/CouponUsed.java b/src/org/openbravo/retail/discounts/coupons/CouponUsed.java --- a/src/org/openbravo/retail/discounts/coupons/CouponUsed.java +++ b/src/org/openbravo/retail/discounts/coupons/CouponUsed.java @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2014 Openbravo S.L.U. + * Copyright (C) 2014-2019 Openbravo S.L.U. * Licensed under the Openbravo Commercial License version 1.0 * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html * or in the legal folder of this module distribution. @@ -9,30 +9,42 @@ package org.openbravo.retail.discounts.coupons; +import java.util.List; + import javax.servlet.ServletException; +import org.codehaus.jettison.json.JSONArray; import org.codehaus.jettison.json.JSONException; import org.codehaus.jettison.json.JSONObject; +import org.hibernate.criterion.Restrictions; import org.openbravo.dal.core.OBContext; +import org.openbravo.dal.service.OBCriteria; import org.openbravo.dal.service.OBDal; import org.openbravo.retail.posterminal.JSONProcessSimple; public class CouponUsed extends JSONProcessSimple { @Override public JSONObject exec(JSONObject jsonData) throws JSONException, ServletException { - String strCouponId; OBContext.setAdminMode(true); JSONObject result = new JSONObject(); try { - strCouponId = jsonData.getString("coupon"); - Coupon coupon = OBDal.getInstance().get(Coupon.class, strCouponId); - if ("NU".equals(coupon.getStatus())) { - result.put("used", false); - } else { - result.put("used", true); + JSONArray usedCoupons = new JSONArray(); + JSONArray couponsIds = jsonData.getJSONArray("couponIds"); + OBCriteria<Coupon> criteria = OBDal.getInstance().createCriteria(Coupon.class); + for (int i = 0; i < couponsIds.length(); i++) { + criteria.add( + Restrictions.in(Coupon.PROPERTY_ID, couponsIds.getJSONObject(i).get("couponCode"))); } - + List<Coupon> queryResult = criteria.list(); + for (Coupon coupon : queryResult) { + JSONObject couponStatus = new JSONObject(); + if (!"NU".equals(coupon.getStatus())) { + couponStatus.put("couponCode", coupon.getCouponcode()); + usedCoupons.put(couponStatus); + } + } + result.put("errorCoupons", usedCoupons); } catch (Exception e) { JSONObject finalResult = new JSONObject(); result.put("message", e.getMessage()); @@ -48,10 +60,4 @@ finalResult.put("status", 0); return finalResult; } - - @Override - protected String getProperty() { - return "OBPOS_approval.discounts"; - } - } diff --git a/src/org/openbravo/retail/discounts/coupons/CouponsComponentProvider.java b/src/org/openbravo/retail/discounts/coupons/CouponsComponentProvider.java --- a/src/org/openbravo/retail/discounts/coupons/CouponsComponentProvider.java +++ b/src/org/openbravo/retail/discounts/coupons/CouponsComponentProvider.java @@ -1,6 +1,6 @@ /* ************************************************************************************ - * Copyright (C) 2014 Openbravo S.L.U. + * Copyright (C) 2014-2019 Openbravo S.L.U. * Licensed under the Openbravo Commercial License version 1.0 * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html * or in the legal folder of this module distribution. @@ -36,8 +36,9 @@ final List<ComponentResource> globalResources = new ArrayList<ComponentResource>(); final String prefix = "web/org.openbravo.retail.discounts.coupons/js/"; - final String[] resourceDependency = { "menu", "couponcode-popup", "excludecoupon", "coupon", - "preordersavehook", "couponCodeMessage" }; + final String[] resourceDependency = { "utils/utils", "components/menu", + "components/couponcode-popup", "components/removecoupon-popup", "model/excludecoupon", + "hooks/preordersavehook", "hooks/postBarcodeAction" }; for (String resource : resourceDependency) { globalResources.add(createComponentResource(ComponentResourceType.Static, diff --git a/src/org/openbravo/retail/discounts/coupons/OrderLoaderHookCoupons.java b/src/org/openbravo/retail/discounts/coupons/OrderLoaderHookCoupons.java --- a/src/org/openbravo/retail/discounts/coupons/OrderLoaderHookCoupons.java +++ b/src/org/openbravo/retail/discounts/coupons/OrderLoaderHookCoupons.java @@ -40,9 +40,6 @@ if (jsoncoupon.get("offerid").equals(olineOffer.getPriceAdjustment().getId())) { Coupon coupon = OBDal.getInstance().get(Coupon.class, jsoncoupon.get("couponid")); olineOffer.setObdiscpCoupon(coupon); - if (coupon.isOneuse()) { - coupon.setStatus("U"); // Used - } break; } } diff --git a/src/org/openbravo/retail/discounts/coupons/PreOrderLoaderHookCoupons.java b/src/org/openbravo/retail/discounts/coupons/PreOrderLoaderHookCoupons.java new file mode 100644 --- /dev/null +++ b/src/org/openbravo/retail/discounts/coupons/PreOrderLoaderHookCoupons.java @@ -0,0 +1,49 @@ +/* + ************************************************************************************ + * Copyright (C) 2019 Openbravo S.L.U. + * Licensed under the Openbravo Commercial License version 1.0 + * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html + * or in the legal folder of this module distribution. + ************************************************************************************ + */ +package org.openbravo.retail.discounts.coupons; + +import javax.enterprise.context.ApplicationScoped; + +import org.codehaus.jettison.json.JSONArray; +import org.codehaus.jettison.json.JSONObject; +import org.openbravo.dal.service.OBDal; +import org.openbravo.retail.posterminal.OrderLoaderPreProcessHook; + +@ApplicationScoped +public class PreOrderLoaderHookCoupons implements OrderLoaderPreProcessHook { + + @Override + public void exec(JSONObject jsonorder) throws Exception { + if (!(jsonorder.has("coupons") && !jsonorder.isNull("coupons") + && !jsonorder.getString("coupons").equals("null"))) { + return; + } + + JSONArray jsonCoupons = jsonorder.getJSONArray("coupons"); + JSONArray orderLines = jsonorder.getJSONArray("lines"); + for (int i = 0; i < orderLines.length(); i++) { + JSONArray promotions = orderLines.getJSONObject(i).getJSONArray("promotions"); + for (int j = 0; j < promotions.length(); j++) { + if (promotions.getJSONObject(j).getJSONObject("rule").getBoolean("obdiscpIscoupon")) { + for (int z = 0; z < jsonCoupons.length(); z++) { + JSONObject jsoncoupon = jsonCoupons.getJSONObject(z); + if (jsoncoupon.get("offerid").equals(promotions.getJSONObject(j).get("ruleId"))) { + Coupon coupon = OBDal.getInstance().get(Coupon.class, jsoncoupon.get("couponid")); + if (coupon.isOneuse()) { + coupon.setStatus("U"); // Used + } + break; + } + } + } + } + } + OBDal.getInstance().commitAndClose(); + } +} diff --git a/web/org.openbravo.retail.discounts.coupons/js/components/couponcode-popup.js b/web/org.openbravo.retail.discounts.coupons/js/components/couponcode-popup.js new file mode 100644 --- /dev/null +++ b/web/org.openbravo.retail.discounts.coupons/js/components/couponcode-popup.js @@ -0,0 +1,70 @@ +/* + ************************************************************************************ + * Copyright (C) 2014-2019 Openbravo S.L.U. + * Licensed under the Openbravo Commercial License version 1.0 + * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html + * or in the legal folder of this module distribution. + ************************************************************************************ + */ + +/*global enyo */ + +(function () { + + enyo.kind({ + kind: 'OB.UI.ModalAction', + name: 'OBDISCP.UI.insertCouponCode', + i18nHeader: 'OBDISCP_Couponcode', + bodyContent: { + components: [{ + kind: 'OB.UI.SearchInput', + name: 'couponcode', + attributes: '' + }] + }, + bodyButtons: { + components: [{ + kind: 'OBDISCP.UI.okButton' + }, { + + kind: 'OBDISCP.UI.cancelButton' + }] + }, + executeOnShow: function () { + this.$.bodyContent.$.couponcode.setValue(''); + } + }); + + OB.UI.WindowView.registerPopup('OB.OBPOSPointOfSale.UI.PointOfSale', { + kind: 'OBDISCP.UI.insertCouponCode', + name: 'OBDISCP_modalInsertCouponCode' + }); + + enyo.kind({ + name: 'OBDISCP.UI.cancelButton', + kind: 'OB.UI.ModalDialogButton', + isDefaultAction: false, + tap: function () { + this.doHideThisPopup(); + }, + initComponents: function () { + this.inherited(arguments); + this.setContent(OB.I18N.getLabel('OBPOS_Cancel')); + } + }); + + enyo.kind({ + name: 'OBDISCP.UI.okButton', + kind: 'OB.UI.ModalDialogButton', + isDefaultAction: true, + tap: function () { + var couponValue = this.owner.owner.$.bodyContent.$.couponcode.getValue().trim(); + OB.DISCP.searchForCuopons(OB.MobileApp.model.receipt, couponValue); + this.doHideThisPopup(); + }, + initComponents: function () { + this.inherited(arguments); + this.setContent(OB.I18N.getLabel('OBMOBC_LblOk')); + } + }); +}()); \ No newline at end of file diff --git a/web/org.openbravo.retail.discounts.coupons/js/components/menu.js b/web/org.openbravo.retail.discounts.coupons/js/components/menu.js new file mode 100644 --- /dev/null +++ b/web/org.openbravo.retail.discounts.coupons/js/components/menu.js @@ -0,0 +1,53 @@ +/* + ************************************************************************************ + * Copyright (C) 2014-2019 Openbravo S.L.U. + * Licensed under the Openbravo Commercial License version 1.0 + * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html + * or in the legal folder of this module distribution. + ************************************************************************************ + */ + +/*global enyo */ + +(function () { + + enyo.kind({ + name: 'OBDISCP.UI.MenuCoupons', + kind: 'OB.UI.MenuAction', + i18nLabel: 'OBDISCP_Couponcode', + events: { + onShowPopup: '' + }, + tap: function () { + this.inherited(arguments); + this.doShowPopup({ + popup: 'OBDISCP_modalInsertCouponCode' + }); + } + }); + + // Register the menu... + OB.OBPOSPointOfSale.UI.LeftToolbarImpl.prototype.menuEntries.push({ + kind: 'OBDISCP.UI.MenuCoupons' + }); + + enyo.kind({ + name: 'OBDISCP.UI.MenuRemoveCoupons', + kind: 'OB.UI.MenuAction', + i18nLabel: 'OBDISCP_RemoveCoupon', + events: { + onShowPopup: '' + }, + tap: function () { + this.inherited(arguments); + this.doShowPopup({ + popup: 'OBDISCP_modalRemoveCouponCode' + }); + } + }); + + // Register the menu... + OB.OBPOSPointOfSale.UI.LeftToolbarImpl.prototype.menuEntries.push({ + kind: 'OBDISCP.UI.MenuRemoveCoupons' + }); +}()); \ No newline at end of file diff --git a/web/org.openbravo.retail.discounts.coupons/js/components/removecoupon-popup.js b/web/org.openbravo.retail.discounts.coupons/js/components/removecoupon-popup.js new file mode 100644 --- /dev/null +++ b/web/org.openbravo.retail.discounts.coupons/js/components/removecoupon-popup.js @@ -0,0 +1,50 @@ +/* + ************************************************************************************ + * Copyright (C) 2018-2019 Openbravo S.L.U. + * Licensed under the Openbravo Commercial License version 1.0 + * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html + * or in the legal folder of this module distribution. + ************************************************************************************ + */ + +/*global enyo */ + +(function () { + + enyo.kind({ + kind: 'OBDISCP.UI.insertCouponCode', + name: 'OBDISCP.UI.removeCouponCode', + i18nHeader: 'OBDISCP_CouponcodeRemove', + bodyButtons: { + components: [{ + kind: 'OBDISCP.UI.okRemoveButton' + }, { + + kind: 'OBDISCP.UI.cancelButton' + }] + }, + executeOnShow: function () { + this.$.bodyContent.$.couponcode.setValue(''); + } + }); + + OB.UI.WindowView.registerPopup('OB.OBPOSPointOfSale.UI.PointOfSale', { + kind: 'OBDISCP.UI.removeCouponCode', + name: 'OBDISCP_modalRemoveCouponCode' + }); + + enyo.kind({ + name: 'OBDISCP.UI.okRemoveButton', + kind: 'OB.UI.ModalDialogButton', + isDefaultAction: true, + tap: function () { + var couponValue = this.owner.owner.$.bodyContent.$.couponcode.getValue().trim(); + OB.DISCP.removeCoupons(OB.MobileApp.model.receipt, couponValue, undefined); + this.doHideThisPopup(); + }, + initComponents: function () { + this.inherited(arguments); + this.setContent(OB.I18N.getLabel('OBMOBC_LblOk')); + } + }); +}()); \ No newline at end of file diff --git a/web/org.openbravo.retail.discounts.coupons/js/coupon.js b/web/org.openbravo.retail.discounts.coupons/js/coupon.js deleted file mode 100644 --- a/web/org.openbravo.retail.discounts.coupons/js/coupon.js +++ /dev/null @@ -1,26 +0,0 @@ -/* - ************************************************************************************ - * Copyright (C) 2014-2019 Openbravo S.L.U. - * Licensed under the Openbravo Commercial License version 1.0 - * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html - * or in the legal folder of this module distribution. - ************************************************************************************ - */ - -(function () { - - var Coupon = OB.Data.ExtensibleModel.extend({ - modelName: 'Coupon', - tableName: 'obdiscp_coupon', - entityName: 'obdiscp_coupon', - generatedStructure: true, - source: 'org.openbravo.retail.discounts.coupons.model.Coupon', - includeTerminalDate: true - }); - - OB.Data.Registry.registerModel(Coupon); - OB.OBPOSPointOfSale.Model.PointOfSale.prototype.models.push({ - generatedModel: true, - modelName: 'Coupon' - }); -}()); \ No newline at end of file diff --git a/web/org.openbravo.retail.discounts.coupons/js/couponCodeMessage.js b/web/org.openbravo.retail.discounts.coupons/js/couponCodeMessage.js deleted file mode 100644 --- a/web/org.openbravo.retail.discounts.coupons/js/couponCodeMessage.js +++ /dev/null @@ -1,72 +0,0 @@ -/* - ************************************************************************************ - * Copyright (C) 2014 Openbravo S.L.U. - * Licensed under the Openbravo Commercial License version 1.0 - * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html - * or in the legal folder of this module distribution. - ************************************************************************************ - */ - -/*global enyo */ - -(function () { - - enyo.kind({ - kind: 'OB.UI.ModalAction', - name: 'OBDISCP.UI.Message', - closeOnAcceptButton: true, - header: 'label', - events: { - onHideThisPopup: '' - }, - handlers: { - onAcceptButton: 'acceptButton' - }, - bodyContent: { - name: 'bodymessage', - content: 'label' - }, - bodyButtons: { - components: [{ - kind: 'OBDISCP.UI.AcceptMessageButton' - }, { - kind: 'OB.UI.CancelDialogButton', - name: 'cancelButton' - }] - }, - executeOnShow: function () { - this.$.header.setContent(this.args.header || ""); - this.$.bodyContent.$.bodymessage.setContent(this.args.message); - this.$.bodyButtons.$.cancelButton.setShowing(this.args.cancelButton); - }, - acceptButton: function (inSender, inEvent) { - this.doHideThisPopup(); - if (this.args.callback) { - this.args.callback(); - } - } - }); - - enyo.kind({ - name: 'OBDISCP.UI.AcceptMessageButton', - kind: 'OB.UI.ModalDialogButton', - classes: 'btnlink btnlink-gray modal-dialog-button', - isDefaultAction: true, - events: { - onHideThisPopup: '', - onAcceptButton: '' - }, - tap: function () { - this.doAcceptButton(); - }, - initComponents: function () { - this.inherited(arguments); - this.setContent(OB.I18N.getLabel('OBMOBC_LblOk')); - } - }); - - OB.UI.WindowView.registerPopup('OB.OBPOSPointOfSale.UI.PointOfSale', { - kind: 'OBDISCP.UI.Message', - name: 'OBDISCP_UI_Message' - }); -}()); \ No newline at end of file diff --git a/web/org.openbravo.retail.discounts.coupons/js/couponcode-popup.js b/web/org.openbravo.retail.discounts.coupons/js/couponcode-popup.js deleted file mode 100644 --- a/web/org.openbravo.retail.discounts.coupons/js/couponcode-popup.js +++ /dev/null @@ -1,213 +0,0 @@ -/* - ************************************************************************************ - * Copyright (C) 2014-2017 Openbravo S.L.U. - * Licensed under the Openbravo Commercial License version 1.0 - * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html - * or in the legal folder of this module distribution. - ************************************************************************************ - */ - -/*global enyo */ - -(function () { - - enyo.kind({ - kind: 'OB.UI.ModalAction', - name: 'OBDISCP.UI.insertCouponCode', - //header text of the popup. Giving the SK of the label (AD_MESSAGE) - i18nHeader: 'OBDISCP_Couponcode', - //body of the popup - bodyContent: { - components: [{ - kind: 'OB.UI.SearchInput', - name: 'couponcode', - attributes: '' - }] - }, - //buttons of the popup - bodyButtons: { - components: [{ - kind: 'OBDISCP.UI.okButton' - }, { - - kind: 'OBDISCP.UI.cancelButton' - }] - }, - executeOnShow: function () { - //executed when popup is shown. - //to access to argumens -> this.args - this.$.bodyContent.$.couponcode.setValue(''); - } - }); - - OB.UI.WindowView.registerPopup('OB.OBPOSPointOfSale.UI.PointOfSale', { - kind: 'OBDISCP.UI.insertCouponCode', - name: 'OBDISCP_modalInsertCouponCode' - }); - - enyo.kind({ - name: 'OBDISCP.UI.cancelButton', - kind: 'OB.UI.ModalDialogButton', - isDefaultAction: false, - tap: function () { - this.doHideThisPopup(); - }, - initComponents: function () { - this.inherited(arguments); - this.setContent(OB.I18N.getLabel('OBPOS_Cancel')); - } - }); - - enyo.kind({ - name: 'OBDISCP.UI.okButton', - kind: 'OB.UI.ModalDialogButton', - isDefaultAction: true, - tap: function () { - var coupons, criteria, whereClause, order = OB.MobileApp.model.receipt, - dialog = this, - couponValue = this.owner.owner.$.bodyContent.$.couponcode.getValue().trim(); - if (couponValue === "") { - this.bubble('onShowPopup', { - popup: 'OBDISCP_UI_Message', - args: { - message: OB.I18N.getLabel('OBDISCP_NullCode') - } - }); - } else if (couponValue.length > 60) { - this.bubble('onShowPopup', { - popup: 'OBDISCP_UI_Message', - args: { - message: OB.I18N.getLabel('OBDISCP_MaxLength') - } - }); - } else { - whereClause = " as c inner join M_OFFER m on c.m_offer_id = m.m_offer_id WHERE upper(COUPONCODE) ='" + couponValue.toUpperCase() + "' "; - switch (new Date().getDay()) { - case 0: - whereClause = whereClause + " and m.em_obdiscp_sunday='true'"; - break; - case 1: - whereClause = whereClause + " and m.em_obdiscp_monday='true'"; - break; - case 2: - whereClause = whereClause + " and m.em_obdiscp_tuesday='true'"; - break; - case 3: - whereClause = whereClause + " and m.em_obdiscp_wednesday='true'"; - break; - case 4: - whereClause = whereClause + " and m.em_obdiscp_thursday='true'"; - break; - case 5: - whereClause = whereClause + " and m.em_obdiscp_friday='true'"; - break; - case 6: - whereClause = whereClause + " and m.em_obdiscp_saturday='true'"; - break; - } - - criteria = { - '_whereClause': whereClause - }; - - //check if coupon exists, and add it to receipt.coupons - OB.Dal.find(OB.Model.Coupon, criteria, function (d) { - var i; - if (d.length === 0) { - dialog.bubble('onShowPopup', { - popup: 'OBDISCP_UI_Message', - args: { - message: OB.I18N.getLabel('OBDISCP_InvalidCoupon') - } - }); - } else if (d.at(0).get('oneuse') && d.at(0).get('status') === 'U') { - dialog.bubble('onShowPopup', { - popup: 'OBDISCP_UI_Message', - args: { - message: OB.I18N.getLabel('OBDISCP_UsedCoupon') - } - }); - } else if (d.models[0].get('status') === 'NU') { - coupons = order.get('coupons'); - var offerExists = false, - serverCallCouponUsed = new OB.DS.Process('org.openbravo.retail.discounts.coupons.CouponUsed'); - if (coupons === undefined || coupons === null || coupons.length === 0) { - coupons = []; - } else { - for (i = 0; i < coupons.length; i++) { - if (coupons[i].offerid === d.at(0).get('promotionDiscount')) { - offerExists = true; - break; - } - } - } - if (!offerExists) { - if (d.at(0).get('oneuse')) { // if it is oneUse coupon, check in the backend if it has already been used - serverCallCouponUsed.exec({ - coupon: d.at(0).get('id') - }, function (data) { - if (data && !data.exception) { - if (!data.used) { // if coupon is 'not used' then add the coupon - coupons.push({ - couponcode: d.at(0).get('couponcode'), - couponid: d.at(0).get('id'), - offerid: d.at(0).get('promotionDiscount') - }); - order.set('coupons', coupons); - order.calculateReceipt(); - } else { // if coupon has been used, then set as used in local ddbb. - d.at(0).set('status', 'U'); - OB.Dal.save(d.at(0), null, function () { - OB.error(OB.I18N.getLabel('OBDISCP_ErrorModifyingCoupon'), arguments); - }); - dialog.bubble('onShowPopup', { - popup: 'OBDISCP_UI_Message', - args: { - message: OB.I18N.getLabel('OBDISCP_CouponUsed') - } - }); - } - } else { - OB.error(OB.I18N.getLabel('OBDISCP_ErrorGettingIsUsedInfo'), arguments); - dialog.bubble('onShowPopup', { - popup: 'OBDISCP_UI_Message', - args: { - message: OB.I18N.getLabel('OBDISCP_ErrorGettingIsUsedInfo') - } - }); - } - }); - - } else { - coupons.push({ - couponcode: d.at(0).get('couponcode'), - couponid: d.at(0).get('id'), - offerid: d.at(0).get('promotionDiscount') - }); - order.set('coupons', coupons); - order.calculateReceipt(); - } - } else { - dialog.bubble('onShowPopup', { - popup: 'OBDISCP_UI_Message', - args: { - message: OB.I18N.getLabel('OBDISCP_SameDiscount') - } - }); - } - dialog.doHideThisPopup(); - } - - }, function () { - OB.error(OB.I18N.getLabel('OBDISCP_ErrorGettingCoupons'), arguments); - }); - } - - - }, - initComponents: function () { - this.inherited(arguments); - this.setContent(OB.I18N.getLabel('OBMOBC_LblOk')); - } - }); -}()); \ No newline at end of file diff --git a/web/org.openbravo.retail.discounts.coupons/js/excludecoupon.js b/web/org.openbravo.retail.discounts.coupons/js/excludecoupon.js deleted file mode 100644 --- a/web/org.openbravo.retail.discounts.coupons/js/excludecoupon.js +++ /dev/null @@ -1,32 +0,0 @@ -/* - ************************************************************************************ - * Copyright (C) 2014 Openbravo S.L.U. - * Licensed under the Openbravo Commercial License version 1.0 - * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html - * or in the legal folder of this module distribution. - ************************************************************************************ - */ - -// extending additional filters to ignore discounts when Iscoupons=true, -// or creating dynamic filter with the coupons inserted -OB.Model.Discounts.additionalFilters.push({ - generateFilter: function (receipt) { - var currentCoupons = "", - i, filter = ""; - if (receipt.get('coupons')) { - for (i = 0; i < receipt.get('coupons').length; i++) { - if (i !== 0) { - currentCoupons += ","; - } - currentCoupons += "'" + receipt.get('coupons')[i].offerid + "'"; - } - } - filter = "and (M_Offer.EM_OBDISCP_ISCOUPON !='true'"; - if (currentCoupons !== "") { - filter += " or M_Offer.M_Offer_Id in (" + currentCoupons + ")) "; - } else { - filter += ")"; - } - return filter; - } -}); \ No newline at end of file diff --git a/web/org.openbravo.retail.discounts.coupons/js/hooks/postBarcodeAction.js b/web/org.openbravo.retail.discounts.coupons/js/hooks/postBarcodeAction.js new file mode 100644 --- /dev/null +++ b/web/org.openbravo.retail.discounts.coupons/js/hooks/postBarcodeAction.js @@ -0,0 +1,21 @@ +/* + ************************************************************************************ + * Copyright (C) 2019 Openbravo S.L.U. + * Licensed under the Openbravo Commercial License version 1.0 + * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html + * or in the legal folder of this module distribution. + ************************************************************************************ + */ + +(function () { + OB.UTIL.HookManager.registerHook('OBPOS_PostBarcodeAction', function (args, callbacks) { + if (!args.cancellation) { + OB.DISCP.searchForCuopons(OB.MobileApp.model.receipt, args.code, function (success) { + if (success) { + args.cancellation = true; + } + OB.UTIL.HookManager.callbackExecutor(args, callbacks); + }); + } + }); +}()); \ No newline at end of file diff --git a/web/org.openbravo.retail.discounts.coupons/js/hooks/preordersavehook.js b/web/org.openbravo.retail.discounts.coupons/js/hooks/preordersavehook.js new file mode 100644 --- /dev/null +++ b/web/org.openbravo.retail.discounts.coupons/js/hooks/preordersavehook.js @@ -0,0 +1,72 @@ +/* + ************************************************************************************ + * Copyright (C) 2014-2019 Openbravo S.L.U. + * Licensed under the Openbravo Commercial License version 1.0 + * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html + * or in the legal folder of this module distribution. + ************************************************************************************ + */ + +/*global, _ */ + +(function () { + + OB.UTIL.HookManager.registerHook('OBPOS_PreOrderSave', function (args, callbacks) { + var i, c, couponIds = [], + checkIsValid = new OB.DS.Process('org.openbravo.retail.discounts.coupons.CouponUsed'), + receipt = args.receipt, + errorCoupons = ''; + if (receipt.get('lines') && receipt.get('coupons') && receipt.get('coupons').length > 0) { + _.forEach(receipt.get('lines').models, function (line) { + if (line.get('promotions')) { + for (i = 0; i < line.get('promotions').length; i++) { + for (c = 0; c < receipt.get('coupons').length; c++) { + if (receipt.get('coupons')[c].offerid === line.get('promotions')[i].ruleId) { + couponIds.push({ + couponCode: receipt.get('coupons')[c].couponid + }); + break; + } + } + } + } + }); + //call to the backend to check if all the IDs are available + checkIsValid.exec({ + couponIds: couponIds + }, function (data) { + if (data && (data.exception || data.errorCoupons.length > 0)) { + args.cancellation = true; + for (i = 0; i < data.errorCoupons.length; i++) { + if (i !== data.errorCoupons.length - 1) { + errorCoupons = errorCoupons.concat(data.errorCoupons[i].couponCode + ','); + } else { + errorCoupons = errorCoupons.concat(data.errorCoupons[i].couponCode); + } + } + if (errorCoupons !== '') { + //Add component for additional button which should be able to remove the used coupons in the errorCouponslist + OB.UTIL.HookManager.callbackExecutor(args, callbacks); + OB.UTIL.showConfirmation.display(OB.I18N.getLabel('OBDISCP_InvalidCodes'), errorCoupons, [{ + label: OB.I18N.getLabel('OBMOBC_LblOk') + }, { + label: OB.I18N.getLabel('OBDISCP_RemoveCoupon'), + action: function () { + OB.DISCP.removeCoupons(receipt, errorCoupons); + } + }]); + } + } else { + OB.UTIL.HookManager.callbackExecutor(args, callbacks); + } + return; + }, function (data) { + args.cancellation = true; + OB.UTIL.HookManager.callbackExecutor(args, callbacks); + return; + }); + } else { + OB.UTIL.HookManager.callbackExecutor(args, callbacks); + } + }); +}()); \ No newline at end of file diff --git a/web/org.openbravo.retail.discounts.coupons/js/menu.js b/web/org.openbravo.retail.discounts.coupons/js/menu.js deleted file mode 100644 --- a/web/org.openbravo.retail.discounts.coupons/js/menu.js +++ /dev/null @@ -1,33 +0,0 @@ -/* - ************************************************************************************ - * Copyright (C) 2014 Openbravo S.L.U. - * Licensed under the Openbravo Commercial License version 1.0 - * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html - * or in the legal folder of this module distribution. - ************************************************************************************ - */ - -/*global enyo */ - -(function () { - - enyo.kind({ - name: 'OBDISCP.UI.MenuCoupons', - kind: 'OB.UI.MenuAction', - i18nLabel: 'OBDISCP_Couponcode', - events: { - onShowPopup: '' - }, - tap: function () { - this.inherited(arguments); // auto close the menu - this.doShowPopup({ - popup: 'OBDISCP_modalInsertCouponCode' - }); - } - }); - - // Register the menu... - OB.OBPOSPointOfSale.UI.LeftToolbarImpl.prototype.menuEntries.push({ - kind: 'OBDISCP.UI.MenuCoupons' - }); -}()); \ No newline at end of file diff --git a/web/org.openbravo.retail.discounts.coupons/js/model/excludecoupon.js b/web/org.openbravo.retail.discounts.coupons/js/model/excludecoupon.js new file mode 100644 --- /dev/null +++ b/web/org.openbravo.retail.discounts.coupons/js/model/excludecoupon.js @@ -0,0 +1,32 @@ +/* + ************************************************************************************ + * Copyright (C) 2019 Openbravo S.L.U. + * Licensed under the Openbravo Commercial License version 1.0 + * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html + * or in the legal folder of this module distribution. + ************************************************************************************ + */ + +// extending additional filters to ignore discounts when Iscoupons=true, +// or creating dynamic filter with the coupons inserted +OB.Model.Discounts.additionalFilters.push({ + generateFilter: function (receipt) { + var currentCoupons = "", + i, filter = ""; + if (receipt.get('coupons')) { + for (i = 0; i < receipt.get('coupons').length; i++) { + if (i !== 0) { + currentCoupons += ","; + } + currentCoupons += "'" + receipt.get('coupons')[i].offerid + "'"; + } + } + filter = "and (M_Offer.EM_OBDISCP_ISCOUPON !='true'"; + if (currentCoupons !== "") { + filter += " or M_Offer.M_Offer_Id in (" + currentCoupons + ")) "; + } else { + filter += ")"; + } + return filter; + } +}); \ No newline at end of file diff --git a/web/org.openbravo.retail.discounts.coupons/js/preordersavehook.js b/web/org.openbravo.retail.discounts.coupons/js/preordersavehook.js deleted file mode 100644 --- a/web/org.openbravo.retail.discounts.coupons/js/preordersavehook.js +++ /dev/null @@ -1,57 +0,0 @@ -/* - ************************************************************************************ - * Copyright (C) 2014 Openbravo S.L.U. - * Licensed under the Openbravo Commercial License version 1.0 - * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html - * or in the legal folder of this module distribution. - ************************************************************************************ - */ - - -(function () { - - OB.UTIL.HookManager.registerHook('OBPOS_PreOrderSave', function (args, callbacks) { - var i, j, c, whereClause, criteria, couponIds = ""; - - //for each line check if each promotion is a coupon, and if the coupon is only for one use, set it as used. - if (args.receipt.get('lines') && args.receipt.get('coupons')) { - for (i = 0; i < args.receipt.get('lines').length; i++) { - if (args.receipt.get('lines').at(i).get('promotions')) { - for (j = 0; j < args.receipt.get('lines').at(i).get('promotions').length; j++) { - for (c = 0; c < args.receipt.get('coupons').length; c++) { - if (args.receipt.get('coupons')[c].offerid === args.receipt.get('lines').at(i).get('promotions')[j].ruleId) { - if (couponIds === "") { - couponIds = "'" + args.receipt.get('coupons')[c].couponid + "'"; - } else { - couponIds = couponIds + ", '" + args.receipt.get('coupons')[c].couponid + "'"; - } - break; - } - } - } - } - } - } - if (couponIds !== "") { - whereClause = " where oneuse='true' and obdiscp_coupon_id IN (" + couponIds + ")"; - criteria = { - '_whereClause': whereClause - }; - - OB.Dal.find(OB.Model.Coupon, criteria, function (e) { - e.forEach(function (coupon) { - coupon.set('status', 'U'); - OB.Dal.save(coupon, null, function () { - OB.error(OB.I18N.getLabel('OBDISCP_ErrorModifyingCoupon'), arguments); - }); - }); - }, function () { - OB.error(OB.I18N.getLabel('OBDISCP_ErrorGettingCoupons'), arguments); - }); - } - OB.UTIL.HookManager.callbackExecutor(args, callbacks); - - return; - }); - -}()); \ No newline at end of file diff --git a/web/org.openbravo.retail.discounts.coupons/js/utils/utils.js b/web/org.openbravo.retail.discounts.coupons/js/utils/utils.js new file mode 100644 --- /dev/null +++ b/web/org.openbravo.retail.discounts.coupons/js/utils/utils.js @@ -0,0 +1,112 @@ +/* + ************************************************************************************ + * Copyright (C) 2018-2019 Openbravo S.L.U. + * Licensed under the Openbravo Commercial License version 1.0 + * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html + * or in the legal folder of this module distribution. + ************************************************************************************ + */ + +/*global, _, moment */ + +(function () { + + OB = OB || {}; + OB.DISCP = { + searchForCuopons: function (order, couponValue, callback) { + + var callbackSuccess = function (coupons, order, coupon) { + coupons.push({ + couponcode: coupon.couponCode, + couponid: coupon.id, + offerid: coupon.promotionDiscount + }); + order.set('coupons', coupons); + order.calculateReceipt(function () { + if (callback && typeof (callback) === 'function') { + callback(true); + } + }); + }, + callbackError = function () { + if (callback && typeof (callback) === 'function') { + callback(false); + } + }, + callbackNotApplicable = function () { + if (callback && typeof (callback) === 'function') { + callback(true); + } + }, + coupons = order.get('coupons'), + offerExists = false, + i; + + + //Change all the logic to use process requests + var checkCouponAvailability = new OB.DS.Process('org.openbravo.retail.discounts.coupons.CouponAvailability'), + currentTime = moment(); + + checkCouponAvailability.exec({ + couponId: couponValue, + day: currentTime.day(), + time: currentTime.format('YYYY-MM-DD HH:mm:ss') + }, function (data) { + if (data && !data.exception) { + if (data.used) { + if (data.isValid) { + OB.UTIL.showConfirmation.display('', OB.I18N.getLabel('OBDISCP_UsedCoupon')); + } else { + OB.UTIL.showConfirmation.display('', OB.I18N.getLabel('OBDISCP_InvalidCoupon')); + } + callbackNotApplicable(); + } else { + if (coupons === undefined || coupons === null || coupons.length === 0) { + coupons = []; + } else { + for (i = 0; i < coupons.length; i++) { + if (coupons[i].offerid === data.promotionDiscount) { + offerExists = true; + break; + } + } + } + if (!offerExists) { + callbackSuccess(coupons, order, data); + } else { + OB.UTIL.showConfirmation.display('', OB.I18N.getLabel('OBDISCP_SameDiscount')); + callbackNotApplicable(); + } + } + } else { + callbackError(); + } + }, function (data) { + callbackError(); + }); + }, + removeCoupons: function (order, couponCodes, callback) { + var i, couponsToRemove = couponCodes.split(','), + codes, couponFound = false, + couponToRemove; + if (order.get('coupons')) { + if (order.get('coupons').length === 0) { + return; + } + codes = _.pluck(order.get('coupons'), 'couponcode'); + for (i = codes.length - 1; i >= 0; i--) { + couponToRemove = couponsToRemove.indexOf(codes[i]); + if (couponToRemove !== -1) { + order.get('coupons').splice(couponToRemove, 1); + couponFound = true; + } + } + if (couponFound) { + order.calculateReceipt(callback); + } else { + OB.UTIL.showConfirmation.display('', OB.I18N.getLabel('OBDISCP_CodeNotFound')); + } + } + } + }; +}()); \ No newline at end of file

Notes
(0112309) hgbot (developer) 2019-05-31 15:52	Repository: erp/pmods/org.openbravo.retail.discounts.coupons Changeset: 1af503c896079f501f327abfcf4551e246532011 Author: Eduardo Becerra <ebec70 <at> yahoo.com> Date: Fri May 31 15:43:44 2019 +0200 URL: http://code.openbravo.com/erp/pmods/org.openbravo.retail.discounts.coupons/rev/1af503c896079f501f327abfcf4551e246532011 [^] Fixed issue 40243: Retail Coupons Improvements --- M src-db/database/model/modifiedTables/M_OFFER.xml M src-db/database/model/tables/OBDISCP_COUPON.xml M src-db/database/sourcedata/AD_COLUMN.xml M src-db/database/sourcedata/AD_ELEMENT.xml M src-db/database/sourcedata/AD_FIELD.xml M src-db/database/sourcedata/AD_MESSAGE.xml M src-db/database/sourcedata/OBMOBC_SERVICES.xml M src/org/openbravo/retail/discounts/coupons/CouponUsed.java M src/org/openbravo/retail/discounts/coupons/CouponsComponentProvider.java M src/org/openbravo/retail/discounts/coupons/OrderLoaderHookCoupons.java A src/org/openbravo/retail/discounts/coupons/CouponAvailability.java A src/org/openbravo/retail/discounts/coupons/PreOrderLoaderHookCoupons.java A web/org.openbravo.retail.discounts.coupons/js/components/couponcode-popup.js A web/org.openbravo.retail.discounts.coupons/js/components/menu.js A web/org.openbravo.retail.discounts.coupons/js/components/removecoupon-popup.js A web/org.openbravo.retail.discounts.coupons/js/hooks/postBarcodeAction.js A web/org.openbravo.retail.discounts.coupons/js/hooks/preordersavehook.js A web/org.openbravo.retail.discounts.coupons/js/model/excludecoupon.js A web/org.openbravo.retail.discounts.coupons/js/utils/utils.js R web/org.openbravo.retail.discounts.coupons/js/coupon.js R web/org.openbravo.retail.discounts.coupons/js/couponCodeMessage.js R web/org.openbravo.retail.discounts.coupons/js/couponcode-popup.js R web/org.openbravo.retail.discounts.coupons/js/excludecoupon.js R web/org.openbravo.retail.discounts.coupons/js/menu.js R web/org.openbravo.retail.discounts.coupons/js/preordersavehook.js ---

Issue History
Date Modified	Username	Field	Change
2019-02-20 12:09	ebecerra	New Issue
2019-02-20 12:09	ebecerra	Assigned To	=> Retail
2019-02-20 12:09	ebecerra	Triggers an Emergency Pack	=> No
2019-02-20 13:25	ebecerra	File Added: Test_I40243.diff
2019-02-20 13:32	ebecerra	File Added: discounts-coupons.diff
2019-05-31 15:52	hgbot	Checkin
2019-05-31 15:52	hgbot	Note Added: 0112309
2019-05-31 15:52	hgbot	Status	new => resolved
2019-05-31 15:52	hgbot	Resolution	open => fixed
2019-05-31 15:52	hgbot	Fixed in SCM revision	=> http://code.openbravo.com/erp/pmods/org.openbravo.retail.discounts.coupons/rev/1af503c896079f501f327abfcf4551e246532011 [^]
2019-06-03 12:16	marvintm	Assigned To	Retail => ebecerra
2019-06-06 20:18	marvintm	Review Assigned To	=> marvintm
2019-06-06 20:18	marvintm	Status	resolved => closed
2019-06-06 20:18	marvintm	Fixed in Version	=> RR19Q3

Relationships [ Relation Graph ] [ Dependency Graph ]