diff --git a/image/topping2/bt_cold_disable2.png b/image/topping2/bt_cold_disable2.png new file mode 100644 index 00000000..2c9bcf88 Binary files /dev/null and b/image/topping2/bt_cold_disable2.png differ diff --git a/image/topping2/bt_hot_disable2.png b/image/topping2/bt_hot_disable2.png new file mode 100644 index 00000000..8ef29063 Binary files /dev/null and b/image/topping2/bt_hot_disable2.png differ diff --git a/image/topping2/bt_smoothie_disable2.png b/image/topping2/bt_smoothie_disable2.png new file mode 100644 index 00000000..3808ad30 Binary files /dev/null and b/image/topping2/bt_smoothie_disable2.png differ diff --git a/image/topping2_en/bt_cold_disable2.png b/image/topping2_en/bt_cold_disable2.png new file mode 100644 index 00000000..30db79a7 Binary files /dev/null and b/image/topping2_en/bt_cold_disable2.png differ diff --git a/image/topping2_en/bt_hot_disable2.png b/image/topping2_en/bt_hot_disable2.png new file mode 100644 index 00000000..a8d93ce5 Binary files /dev/null and b/image/topping2_en/bt_hot_disable2.png differ diff --git a/image/topping2_en/bt_smoothie_disable2.png b/image/topping2_en/bt_smoothie_disable2.png new file mode 100644 index 00000000..720cded5 Binary files /dev/null and b/image/topping2_en/bt_smoothie_disable2.png differ diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py index 680844ed..e5e6f29c 100644 --- a/xml/menu_new_layout_gen.py +++ b/xml/menu_new_layout_gen.py @@ -7,6 +7,8 @@ out_xml(' "Vertical" \r\n') out_xml(' 4 \r\n') + pd_code_available = '##-##-##-####' + count_test = 0 out_xml('; menu_new_list '+ str(len(menu_new_list))+'\r\n') for spl in menu_new_list: @@ -27,7 +29,25 @@ str_con += spl[6] + '.Button,' out_xml( '\t Flag( '+ str_con + ') \r\n') - + + pd_code_1 = spl[4] + pd_stage1 = '$' + spl[4] + '.Button' + if spl[4] == "-" or len(spl[4]) == 0 : + pd_code_1 = pd_code_available + pd_stage1 = '"Disable2"' + + pd_code_2 = spl[5] + pd_stage2 = '$' + spl[5] + '.Button' + if spl[5] == "-" or len(spl[5]) == 0: + pd_code_2 = pd_code_available + pd_stage2 = '"Disable2"' + + pd_code_3 = spl[6] + pd_stage3 = '$' + spl[6] + '.Button' + if spl[6] == "-" or len(spl[6]) == 0: + pd_code_3 = pd_code_available + pd_stage3 = '"Disable2"' + out_xml( '\t @@ -737,6 +746,15 @@ Var PriceD1 = $12-11-01-0001.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-11-01-0001" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-11-01-0001.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -867,6 +885,15 @@ Var PriceD1 = $12-01-01-0013.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0013" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0013.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1001,6 +1028,15 @@ Strawberry, Orange, Floral" Var PriceD1 = $12-01-01-0020.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0020" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0020.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1135,6 +1171,15 @@ Note: Blue Berry and Floral" Var PriceD1 = $12-01-01-0022.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0022" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0022.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1269,6 +1314,15 @@ Note: Strawberry & Floral" Var PriceD1 = $12-01-01-0024.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0024" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0024.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1403,6 +1457,15 @@ Note: Jasmine & Honey" Var PriceD1 = $12-01-01-0026.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0026" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0026.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1537,6 +1600,15 @@ Note: Whisky & Vanilla" Var PriceD1 = $12-01-01-0028.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0028" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0028.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1671,6 +1743,15 @@ Note: Peach, tea, chocolate" Var PriceD1 = $12-01-01-0033.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0033" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0033.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1804,6 +1885,15 @@ ESPRESSO" Var PriceD1 = $12-01-01-0003.Price Var PriceD2 = $12-01-02-0001.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0003" + Var PD_CODE2 = "12-01-02-0001" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0003.Button + Var PD_STAGE_2 = $12-01-02-0001.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1934,6 +2024,15 @@ ESPRESSO" Var PriceD1 = $12-01-01-0014.Price Var PriceD2 = $12-01-02-0011.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0014" + Var PD_CODE2 = "12-01-02-0011" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0014.Button + Var PD_STAGE_2 = $12-01-02-0011.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2068,6 +2167,15 @@ Strawberry, Orange, Floral" Var PriceD1 = $12-01-01-0019.Price Var PriceD2 = $12-01-02-0019.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0019" + Var PD_CODE2 = "12-01-02-0019" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0019.Button + Var PD_STAGE_2 = $12-01-02-0019.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2202,6 +2310,15 @@ Note: Blue Berry and Floral" Var PriceD1 = $12-01-01-0021.Price Var PriceD2 = $12-01-02-0021.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0021" + Var PD_CODE2 = "12-01-02-0021" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0021.Button + Var PD_STAGE_2 = $12-01-02-0021.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2336,6 +2453,15 @@ Note: Strawberry & Floral" Var PriceD1 = $12-01-01-0025.Price Var PriceD2 = $12-01-02-0025.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0025" + Var PD_CODE2 = "12-01-02-0025" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0025.Button + Var PD_STAGE_2 = $12-01-02-0025.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2470,6 +2596,15 @@ Note: Whisky & Vanilla" Var PriceD1 = $12-01-01-0023.Price Var PriceD2 = $12-01-02-0023.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0023" + Var PD_CODE2 = "12-01-02-0023" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0023.Button + Var PD_STAGE_2 = $12-01-02-0023.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2604,6 +2739,15 @@ Note: Jasmine & Honey" Var PriceD1 = $12-01-01-0027.Price Var PriceD2 = $12-01-02-0027.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0027" + Var PD_CODE2 = "12-01-02-0027" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0027.Button + Var PD_STAGE_2 = $12-01-02-0027.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2738,6 +2882,15 @@ Note: Peach, tea, chocolate" Var PriceD1 = $12-01-01-0032.Price Var PriceD2 = $12-01-02-0032.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0032" + Var PD_CODE2 = "12-01-02-0032" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0032.Button + Var PD_STAGE_2 = $12-01-02-0032.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2871,6 +3024,15 @@ AMERICANO" Var PriceD1 = $-.Price Var PriceD2 = $12-01-02-0020.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-01-02-0020" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-01-02-0020.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3005,6 +3167,15 @@ Note: Blue Berry and Floral" Var PriceD1 = $-.Price Var PriceD2 = $12-01-02-0022.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-01-02-0022" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-01-02-0022.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3139,6 +3310,15 @@ Note: Strawberry & Floral" Var PriceD1 = $-.Price Var PriceD2 = $12-01-02-0026.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-01-02-0026" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-01-02-0026.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3273,6 +3453,15 @@ Note: Whisky & Vanilla" Var PriceD1 = $-.Price Var PriceD2 = $12-01-02-0024.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-01-02-0024" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-01-02-0024.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3407,6 +3596,15 @@ Note: Jasmine & Honey" Var PriceD1 = $-.Price Var PriceD2 = $12-01-02-0018.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-01-02-0018" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-01-02-0018.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3541,6 +3739,15 @@ Strawberry, Orange, Floral" Var PriceD1 = $-.Price Var PriceD2 = $12-01-02-0028.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-01-02-0028" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-01-02-0028.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3675,6 +3882,15 @@ Note: Peach, tea, chocolate" Var PriceD1 = $-.Price Var PriceD2 = $12-01-02-0033.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-01-02-0033" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-01-02-0033.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3808,6 +4024,15 @@ ALMOST DIRTY" Var PriceD1 = $12-01-01-0004.Price Var PriceD2 = $12-01-02-0002.Price Var PriceD3 = $12-01-03-0002.Price + Var PD_CODE1 = "12-01-01-0004" + Var PD_CODE2 = "12-01-02-0002" + Var PD_CODE3 = "12-01-03-0002" + Var PD_STAGE_1 = $12-01-01-0004.Button + Var PD_STAGE_2 = $12-01-02-0002.Button + Var PD_STAGE_3 = $12-01-03-0002.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3939,6 +4164,15 @@ Foamed milk" Var PriceD1 = $12-01-01-0005.Price Var PriceD2 = $12-11-02-0002.Price Var PriceD3 = $12-11-03-0002.Price + Var PD_CODE1 = "12-01-01-0005" + Var PD_CODE2 = "12-11-02-0002" + Var PD_CODE3 = "12-11-03-0002" + Var PD_STAGE_1 = $12-01-01-0005.Button + Var PD_STAGE_2 = $12-11-02-0002.Button + Var PD_STAGE_3 = $12-11-03-0002.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4070,6 +4304,15 @@ Foamed milk" Var PriceD1 = $12-01-01-0006.Price Var PriceD2 = $12-01-02-0003.Price Var PriceD3 = $12-01-03-0003.Price + Var PD_CODE1 = "12-01-01-0006" + Var PD_CODE2 = "12-01-02-0003" + Var PD_CODE3 = "12-01-03-0003" + Var PD_STAGE_1 = $12-01-01-0006.Button + Var PD_STAGE_2 = $12-01-02-0003.Button + Var PD_STAGE_3 = $12-01-03-0003.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4202,6 +4445,15 @@ Milk, Sugar" Var PriceD1 = $12-01-01-0007.Price Var PriceD2 = $12-01-02-0004.Price Var PriceD3 = $12-01-03-0004.Price + Var PD_CODE1 = "12-01-01-0007" + Var PD_CODE2 = "12-01-02-0004" + Var PD_CODE3 = "12-01-03-0004" + Var PD_STAGE_1 = $12-01-01-0007.Button + Var PD_STAGE_2 = $12-01-02-0004.Button + Var PD_STAGE_3 = $12-01-03-0004.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4334,6 +4586,15 @@ Caramel Syrup" Var PriceD1 = $12-01-01-0031.Price Var PriceD2 = $12-01-02-0031.Price Var PriceD3 = $12-01-03-0031.Price + Var PD_CODE1 = "12-01-01-0031" + Var PD_CODE2 = "12-01-02-0031" + Var PD_CODE3 = "12-01-03-0031" + Var PD_STAGE_1 = $12-01-01-0031.Button + Var PD_STAGE_2 = $12-01-02-0031.Button + Var PD_STAGE_3 = $12-01-03-0031.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4466,6 +4727,15 @@ CAFÉ LATTE" Var PriceD1 = $12-01-01-0008.Price Var PriceD2 = $12-01-02-0005.Price Var PriceD3 = $12-01-03-0005.Price + Var PD_CODE1 = "12-01-01-0008" + Var PD_CODE2 = "12-01-02-0005" + Var PD_CODE3 = "12-01-03-0005" + Var PD_STAGE_1 = $12-01-01-0008.Button + Var PD_STAGE_2 = $12-01-02-0005.Button + Var PD_STAGE_3 = $12-01-03-0005.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4598,6 +4868,15 @@ CAFÉ LATTE" Var PriceD1 = $12-01-01-0011.Price Var PriceD2 = $12-01-02-0008.Price Var PriceD3 = $12-01-03-0008.Price + Var PD_CODE1 = "12-01-01-0011" + Var PD_CODE2 = "12-01-02-0008" + Var PD_CODE3 = "12-01-03-0008" + Var PD_STAGE_1 = $12-01-01-0011.Button + Var PD_STAGE_2 = $12-01-02-0008.Button + Var PD_STAGE_3 = $12-01-03-0008.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4731,6 +5010,15 @@ Kokuto syrup" Var PriceD1 = $12-01-01-0009.Price Var PriceD2 = $12-01-02-0006.Price Var PriceD3 = $12-01-03-0006.Price + Var PD_CODE1 = "12-01-01-0009" + Var PD_CODE2 = "12-01-02-0006" + Var PD_CODE3 = "12-01-03-0006" + Var PD_STAGE_1 = $12-01-01-0009.Button + Var PD_STAGE_2 = $12-01-02-0006.Button + Var PD_STAGE_3 = $12-01-03-0006.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4864,6 +5152,15 @@ Milk, Sugar" Var PriceD1 = $12-01-01-0012.Price Var PriceD2 = $12-01-02-0009.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0012" + Var PD_CODE2 = "12-01-02-0009" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0012.Button + Var PD_STAGE_2 = $12-01-02-0009.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4995,6 +5292,15 @@ Sugar, Water" Var PriceD1 = $12-01-01-0017.Price Var PriceD2 = $12-01-02-0017.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0017" + Var PD_CODE2 = "12-01-02-0017" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0017.Button + Var PD_STAGE_2 = $12-01-02-0017.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -5126,6 +5432,15 @@ Sugar, Water" Var PriceD1 = $12-01-01-0010.Price Var PriceD2 = $12-01-02-0007.Price Var PriceD3 = $12-01-03-0007.Price + Var PD_CODE1 = "12-01-01-0010" + Var PD_CODE2 = "12-01-02-0007" + Var PD_CODE3 = "12-01-03-0007" + Var PD_STAGE_1 = $12-01-01-0010.Button + Var PD_STAGE_2 = $12-01-02-0007.Button + Var PD_STAGE_3 = $12-01-03-0007.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -5258,6 +5573,15 @@ CAFÉ LATTE" Var PriceD1 = $12-01-01-0029.Price Var PriceD2 = $12-01-02-0029.Price Var PriceD3 = $12-01-03-0029.Price + Var PD_CODE1 = "12-01-01-0029" + Var PD_CODE2 = "12-01-02-0029" + Var PD_CODE3 = "12-01-03-0029" + Var PD_STAGE_1 = $12-01-01-0029.Button + Var PD_STAGE_2 = $12-01-02-0029.Button + Var PD_STAGE_3 = $12-01-03-0029.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -5389,6 +5713,15 @@ CAFÉ LATTE" Var PriceD1 = $12-01-01-0030.Price Var PriceD2 = $12-01-02-0030.Price Var PriceD3 = $12-01-03-0030.Price + Var PD_CODE1 = "12-01-01-0030" + Var PD_CODE2 = "12-01-02-0030" + Var PD_CODE3 = "12-01-03-0030" + Var PD_STAGE_1 = $12-01-01-0030.Button + Var PD_STAGE_2 = $12-01-02-0030.Button + Var PD_STAGE_3 = $12-01-03-0030.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml index 434a3c03..427c85cc 100644 --- a/xml/page_catalog_group_milk.xml +++ b/xml/page_catalog_group_milk.xml @@ -607,6 +607,15 @@ Var PriceD1 = $12-03-01-0005.Price Var PriceD2 = $12-03-02-0005.Price Var PriceD3 = $12-03-03-0005.Price + Var PD_CODE1 = "12-03-01-0005" + Var PD_CODE2 = "12-03-02-0005" + Var PD_CODE3 = "12-03-03-0005" + Var PD_STAGE_1 = $12-03-01-0005.Button + Var PD_STAGE_2 = $12-03-02-0005.Button + Var PD_STAGE_3 = $12-03-03-0005.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -737,6 +746,15 @@ Var PriceD1 = $12-03-01-0001.Price Var PriceD2 = $12-03-02-0001.Price Var PriceD3 = $12-03-03-0001.Price + Var PD_CODE1 = "12-03-01-0001" + Var PD_CODE2 = "12-03-02-0001" + Var PD_CODE3 = "12-03-03-0001" + Var PD_STAGE_1 = $12-03-01-0001.Button + Var PD_STAGE_2 = $12-03-02-0001.Button + Var PD_STAGE_3 = $12-03-03-0001.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -867,6 +885,15 @@ Var PriceD1 = $12-02-02-0009.Price Var PriceD2 = $12-02-01-0009.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-02-02-0009" + Var PD_CODE2 = "12-02-01-0009" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-02-02-0009.Button + Var PD_STAGE_2 = $12-02-01-0009.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -999,6 +1026,15 @@ Water, Ice" Var PriceD1 = $12-03-01-0004.Price Var PriceD2 = $12-03-02-0004.Price Var PriceD3 = $12-03-03-0004.Price + Var PD_CODE1 = "12-03-01-0004" + Var PD_CODE2 = "12-03-02-0004" + Var PD_CODE3 = "12-03-03-0004" + Var PD_STAGE_1 = $12-03-01-0004.Button + Var PD_STAGE_2 = $12-03-02-0004.Button + Var PD_STAGE_3 = $12-03-03-0004.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1131,6 +1167,15 @@ Caramel Syrup" Var PriceD1 = $12-03-01-0003.Price Var PriceD2 = $12-03-02-0003.Price Var PriceD3 = $12-03-03-0003.Price + Var PD_CODE1 = "12-03-01-0003" + Var PD_CODE2 = "12-03-02-0003" + Var PD_CODE3 = "12-03-03-0003" + Var PD_STAGE_1 = $12-03-01-0003.Button + Var PD_STAGE_2 = $12-03-02-0003.Button + Var PD_STAGE_3 = $12-03-03-0003.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1262,6 +1307,15 @@ MILK" Var PriceD1 = $-.Price Var PriceD2 = $12-03-02-0006.Price Var PriceD3 = $12-03-03-0006.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-03-02-0006" + Var PD_CODE3 = "12-03-03-0006" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-03-02-0006.Button + Var PD_STAGE_3 = $12-03-03-0006.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1394,6 +1448,15 @@ Sugar, Ice" Var PriceD1 = $12-03-01-0002.Price Var PriceD2 = $12-03-02-0002.Price Var PriceD3 = $12-03-03-0002.Price + Var PD_CODE1 = "12-03-01-0002" + Var PD_CODE2 = "12-03-02-0002" + Var PD_CODE3 = "12-03-03-0002" + Var PD_STAGE_1 = $12-03-01-0002.Button + Var PD_STAGE_2 = $12-03-02-0002.Button + Var PD_STAGE_3 = $12-03-03-0002.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1524,6 +1587,15 @@ Sugar, Ice" Var PriceD1 = $-.Price Var PriceD2 = $-.Price Var PriceD3 = $12-03-03-0009.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "12-03-03-0009" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = $12-03-03-0009.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml index 3693710c..66b01017 100644 --- a/xml/page_catalog_group_other.xml +++ b/xml/page_catalog_group_other.xml @@ -605,6 +605,15 @@ Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0007.Price Var PriceD3 = $12-05-03-0007.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0007" + Var PD_CODE3 = "12-05-03-0007" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0007.Button + Var PD_STAGE_3 = $12-05-03-0007.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -735,6 +744,15 @@ Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0019.Price Var PriceD3 = $12-05-03-0019.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0019" + Var PD_CODE3 = "12-05-03-0019" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0019.Button + Var PD_STAGE_3 = $12-05-03-0019.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -865,6 +883,15 @@ Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0020.Price Var PriceD3 = $12-05-03-0020.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0020" + Var PD_CODE3 = "12-05-03-0020" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0020.Button + Var PD_STAGE_3 = $12-05-03-0020.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -995,6 +1022,15 @@ Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0035.Price Var PriceD3 = $12-05-03-0035.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0035" + Var PD_CODE3 = "12-05-03-0035" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0035.Button + Var PD_STAGE_3 = $12-05-03-0035.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1126,6 +1162,15 @@ DRINK SODA" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0010.Price Var PriceD3 = $12-05-03-0010.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0010" + Var PD_CODE3 = "12-05-03-0010" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0010.Button + Var PD_STAGE_3 = $12-05-03-0010.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1257,6 +1302,15 @@ SODA" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0033.Price Var PriceD3 = $12-05-03-0033.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0033" + Var PD_CODE3 = "12-05-03-0033" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0033.Button + Var PD_STAGE_3 = $12-05-03-0033.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1387,6 +1441,15 @@ SODA" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0011.Price Var PriceD3 = $12-05-03-0011.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0011" + Var PD_CODE3 = "12-05-03-0011" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0011.Button + Var PD_STAGE_3 = $12-05-03-0011.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1517,6 +1580,15 @@ SODA" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0022.Price Var PriceD3 = $12-05-03-0022.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0022" + Var PD_CODE3 = "12-05-03-0022" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0022.Button + Var PD_STAGE_3 = $12-05-03-0022.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1650,6 +1722,15 @@ Limenade,Soda, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0028.Price Var PriceD3 = $12-05-03-0028.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0028" + Var PD_CODE3 = "12-05-03-0028" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0028.Button + Var PD_STAGE_3 = $12-05-03-0028.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1781,6 +1862,15 @@ Limenade,Soda, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0029.Price Var PriceD3 = $12-05-03-0029.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0029" + Var PD_CODE3 = "12-05-03-0029" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0029.Button + Var PD_STAGE_3 = $12-05-03-0029.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1914,6 +2004,15 @@ Soda, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0012.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0012" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0012.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2045,6 +2144,15 @@ Soda, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0041.Price Var PriceD3 = $12-05-03-0041.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0041" + Var PD_CODE3 = "12-05-03-0041" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0041.Button + Var PD_STAGE_3 = $12-05-03-0041.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2176,6 +2284,15 @@ Soda, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0008.Price Var PriceD3 = $12-05-03-0008.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0008" + Var PD_CODE3 = "12-05-03-0008" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0008.Button + Var PD_STAGE_3 = $12-05-03-0008.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2307,6 +2424,15 @@ Soda, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0009.Price Var PriceD3 = $12-05-03-0009.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0009" + Var PD_CODE3 = "12-05-03-0009" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0009.Button + Var PD_STAGE_3 = $12-05-03-0009.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2440,6 +2566,15 @@ Limenade,Soda, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0024.Price Var PriceD3 = $12-05-03-0024.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0024" + Var PD_CODE3 = "12-05-03-0024" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0024.Button + Var PD_STAGE_3 = $12-05-03-0024.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2570,6 +2705,15 @@ Limenade,Soda, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0025.Price Var PriceD3 = $12-05-03-0025.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0025" + Var PD_CODE3 = "12-05-03-0025" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0025.Button + Var PD_STAGE_3 = $12-05-03-0025.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2703,6 +2847,15 @@ Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0038.Price Var PriceD3 = $12-05-03-0038.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0038" + Var PD_CODE3 = "12-05-03-0038" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0038.Button + Var PD_STAGE_3 = $12-05-03-0038.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2833,6 +2986,15 @@ Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0039.Price Var PriceD3 = $12-05-03-0039.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0039" + Var PD_CODE3 = "12-05-03-0039" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0039.Button + Var PD_STAGE_3 = $12-05-03-0039.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2964,6 +3126,15 @@ SODA" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0014.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0014" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0014.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3094,6 +3265,15 @@ SODA" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0015.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0015" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0015.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3224,6 +3404,15 @@ SODA" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0034.Price Var PriceD3 = $12-05-03-0034.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0034" + Var PD_CODE3 = "12-05-03-0034" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0034.Button + Var PD_STAGE_3 = $12-05-03-0034.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3354,6 +3543,15 @@ SODA" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0003.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0003" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0003.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3486,6 +3684,15 @@ Water, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0004.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0004" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0004.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3617,6 +3824,15 @@ Water, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0002.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0002" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0002.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3748,6 +3964,15 @@ Water, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0005.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0005" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0005.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3880,6 +4105,15 @@ Water, Ice" Var PriceD1 = $12-05-01-0001.Price Var PriceD2 = $12-05-02-0001.Price Var PriceD3 = $12-05-03-0001.Price + Var PD_CODE1 = "12-05-01-0001" + Var PD_CODE2 = "12-05-02-0001" + Var PD_CODE3 = "12-05-03-0001" + Var PD_STAGE_1 = $12-05-01-0001.Button + Var PD_STAGE_2 = $12-05-02-0001.Button + Var PD_STAGE_3 = $12-05-03-0001.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4010,6 +4244,15 @@ Water, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0026.Price Var PriceD3 = $12-05-03-0026.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0026" + Var PD_CODE3 = "12-05-03-0026" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0026.Button + Var PD_STAGE_3 = $12-05-03-0026.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4140,6 +4383,15 @@ Water, Ice" Var PriceD1 = $12-05-02-0032.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-05-02-0032" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-05-02-0032.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4271,6 +4523,15 @@ Water, Ice" Var PriceD1 = $12-05-02-0040.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-05-02-0040" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-05-02-0040.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4402,6 +4663,15 @@ Water, Ice" Var PriceD1 = $12-06-01-0001.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-06-01-0001" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-06-01-0001.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4532,6 +4802,15 @@ Water, Ice" Var PriceD1 = $.Price Var PriceD2 = $12-05-02-0017.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0017" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0017.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4662,6 +4941,15 @@ Water, Ice" Var PriceD1 = $12-05-02-0016.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-05-02-0016" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-05-02-0016.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4792,6 +5080,15 @@ Water, Ice" Var PriceD1 = $12-05-01-0002.Price Var PriceD2 = $12-05-02-0018.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-05-01-0002" + Var PD_CODE2 = "12-05-02-0018" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-05-01-0002.Button + Var PD_STAGE_2 = $12-05-02-0018.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml index 89660638..dce05474 100644 --- a/xml/page_catalog_group_tea.xml +++ b/xml/page_catalog_group_tea.xml @@ -607,6 +607,15 @@ Var PriceD1 = $12-02-01-0001.Price Var PriceD2 = $12-02-02-0001.Price Var PriceD3 = $12-02-03-0001.Price + Var PD_CODE1 = "12-02-01-0001" + Var PD_CODE2 = "12-02-02-0001" + Var PD_CODE3 = "12-02-03-0001" + Var PD_STAGE_1 = $12-02-01-0001.Button + Var PD_STAGE_2 = $12-02-02-0001.Button + Var PD_STAGE_3 = $12-02-03-0001.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -738,6 +747,15 @@ and water" Var PriceD1 = $12-02-01-0020.Price Var PriceD2 = $12-02-02-0020.Price Var PriceD3 = $12-02-03-0020.Price + Var PD_CODE1 = "12-02-01-0020" + Var PD_CODE2 = "12-02-02-0020" + Var PD_CODE3 = "12-02-03-0020" + Var PD_STAGE_1 = $12-02-01-0020.Button + Var PD_STAGE_2 = $12-02-02-0020.Button + Var PD_STAGE_3 = $12-02-03-0020.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -868,6 +886,15 @@ and water" Var PriceD1 = $12-02-01-0007.Price Var PriceD2 = $12-02-02-0007.Price Var PriceD3 = $12-02-03-0007.Price + Var PD_CODE1 = "12-02-01-0007" + Var PD_CODE2 = "12-02-02-0007" + Var PD_CODE3 = "12-02-03-0007" + Var PD_STAGE_1 = $12-02-01-0007.Button + Var PD_STAGE_2 = $12-02-02-0007.Button + Var PD_STAGE_3 = $12-02-03-0007.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -999,6 +1026,15 @@ and water" Var PriceD1 = $12-02-01-0002.Price Var PriceD2 = $12-02-02-0002.Price Var PriceD3 = $12-02-03-0002.Price + Var PD_CODE1 = "12-02-01-0002" + Var PD_CODE2 = "12-02-02-0002" + Var PD_CODE3 = "12-02-03-0002" + Var PD_STAGE_1 = $12-02-01-0002.Button + Var PD_STAGE_2 = $12-02-02-0002.Button + Var PD_STAGE_3 = $12-02-03-0002.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1129,6 +1165,15 @@ and water" Var PriceD1 = $12-02-01-0021.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-02-01-0021" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-02-01-0021.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1260,6 +1305,15 @@ GINGER TEA" Var PriceD1 = $12-02-01-0024.Price Var PriceD2 = $12-02-02-0024.Price Var PriceD3 = $12-02-03-0024.Price + Var PD_CODE1 = "12-02-01-0024" + Var PD_CODE2 = "12-02-02-0024" + Var PD_CODE3 = "12-02-03-0024" + Var PD_STAGE_1 = $12-02-01-0024.Button + Var PD_STAGE_2 = $12-02-02-0024.Button + Var PD_STAGE_3 = $12-02-03-0024.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1390,6 +1444,15 @@ GINGER TEA" Var PriceD1 = $12-02-01-0025.Price Var PriceD2 = $12-02-02-0025.Price Var PriceD3 = $12-02-03-0025.Price + Var PD_CODE1 = "12-02-01-0025" + Var PD_CODE2 = "12-02-02-0025" + Var PD_CODE3 = "12-02-03-0025" + Var PD_STAGE_1 = $12-02-01-0025.Button + Var PD_STAGE_2 = $12-02-02-0025.Button + Var PD_STAGE_3 = $12-02-03-0025.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1521,6 +1584,15 @@ and Warm milk" Var PriceD1 = $12-02-01-0026.Price Var PriceD2 = $12-02-02-0026.Price Var PriceD3 = $12-02-03-0026.Price + Var PD_CODE1 = "12-02-01-0026" + Var PD_CODE2 = "12-02-02-0026" + Var PD_CODE3 = "12-02-03-0026" + Var PD_STAGE_1 = $12-02-01-0026.Button + Var PD_STAGE_2 = $12-02-02-0026.Button + Var PD_STAGE_3 = $12-02-03-0026.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1651,6 +1723,15 @@ and Warm milk" Var PriceD1 = $12-02-01-0027.Price Var PriceD2 = $12-02-02-0027.Price Var PriceD3 = $12-02-03-0027.Price + Var PD_CODE1 = "12-02-01-0027" + Var PD_CODE2 = "12-02-02-0027" + Var PD_CODE3 = "12-02-03-0027" + Var PD_STAGE_1 = $12-02-01-0027.Button + Var PD_STAGE_2 = $12-02-02-0027.Button + Var PD_STAGE_3 = $12-02-03-0027.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1781,6 +1862,15 @@ and Warm milk" Var PriceD1 = $12-02-01-0028.Price Var PriceD2 = $12-02-02-0028.Price Var PriceD3 = $12-02-03-0028.Price + Var PD_CODE1 = "12-02-01-0028" + Var PD_CODE2 = "12-02-02-0028" + Var PD_CODE3 = "12-02-03-0028" + Var PD_STAGE_1 = $12-02-01-0028.Button + Var PD_STAGE_2 = $12-02-02-0028.Button + Var PD_STAGE_3 = $12-02-03-0028.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1914,6 +2004,15 @@ and water" Var PriceD1 = $12-02-01-0011.Price Var PriceD2 = $12-02-02-0011.Price Var PriceD3 = $12-02-03-0011.Price + Var PD_CODE1 = "12-02-01-0011" + Var PD_CODE2 = "12-02-02-0011" + Var PD_CODE3 = "12-02-03-0011" + Var PD_STAGE_1 = $12-02-01-0011.Button + Var PD_STAGE_2 = $12-02-02-0011.Button + Var PD_STAGE_3 = $12-02-03-0011.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2044,6 +2143,15 @@ and water" Var PriceD1 = $12-02-01-0012.Price Var PriceD2 = $12-02-02-0012.Price Var PriceD3 = $12-02-03-0012.Price + Var PD_CODE1 = "12-02-01-0012" + Var PD_CODE2 = "12-02-02-0012" + Var PD_CODE3 = "12-02-03-0012" + Var PD_STAGE_1 = $12-02-01-0012.Button + Var PD_STAGE_2 = $12-02-02-0012.Button + Var PD_STAGE_3 = $12-02-03-0012.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2176,6 +2284,15 @@ LIMENADE" Var PriceD1 = $12-02-02-0006.Price Var PriceD2 = $12-02-01-0006.Price Var PriceD3 = $12-02-03-0006.Price + Var PD_CODE1 = "12-02-02-0006" + Var PD_CODE2 = "12-02-01-0006" + Var PD_CODE3 = "12-02-03-0006" + Var PD_STAGE_1 = $12-02-02-0006.Button + Var PD_STAGE_2 = $12-02-01-0006.Button + Var PD_STAGE_3 = $12-02-03-0006.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2309,6 +2426,15 @@ TEA" Var PriceD1 = $12-02-02-0003.Price Var PriceD2 = $12-02-01-0003.Price Var PriceD3 = $12-02-03-0003.Price + Var PD_CODE1 = "12-02-02-0003" + Var PD_CODE2 = "12-02-01-0003" + Var PD_CODE3 = "12-02-03-0003" + Var PD_STAGE_1 = $12-02-02-0003.Button + Var PD_STAGE_2 = $12-02-01-0003.Button + Var PD_STAGE_3 = $12-02-03-0003.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2439,6 +2565,15 @@ TEA" Var PriceD1 = $12-02-02-0004.Price Var PriceD2 = $12-02-01-0004.Price Var PriceD3 = $12-02-03-0004.Price + Var PD_CODE1 = "12-02-02-0004" + Var PD_CODE2 = "12-02-01-0004" + Var PD_CODE3 = "12-02-03-0004" + Var PD_STAGE_1 = $12-02-02-0004.Button + Var PD_STAGE_2 = $12-02-01-0004.Button + Var PD_STAGE_3 = $12-02-03-0004.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2569,6 +2704,15 @@ TEA" Var PriceD1 = $12-02-02-0008.Price Var PriceD2 = $12-02-01-0008.Price Var PriceD3 = $12-02-03-0008.Price + Var PD_CODE1 = "12-02-02-0008" + Var PD_CODE2 = "12-02-01-0008" + Var PD_CODE3 = "12-02-03-0008" + Var PD_STAGE_1 = $12-02-02-0008.Button + Var PD_STAGE_2 = $12-02-01-0008.Button + Var PD_STAGE_3 = $12-02-03-0008.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2700,6 +2844,15 @@ Sugar, Water, Ice" Var PriceD1 = $12-02-01-0011.Price Var PriceD2 = $12-02-02-0011.Price Var PriceD3 = $12-02-03-0011.Price + Var PD_CODE1 = "12-02-01-0011" + Var PD_CODE2 = "12-02-02-0011" + Var PD_CODE3 = "12-02-03-0011" + Var PD_STAGE_1 = $12-02-01-0011.Button + Var PD_STAGE_2 = $12-02-02-0011.Button + Var PD_STAGE_3 = $12-02-03-0011.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2830,6 +2983,15 @@ Sugar, Water, Ice" Var PriceD1 = $12-02-02-0012.Price Var PriceD2 = $12-02-01-0012.Price Var PriceD3 = $12-02-03-0012.Price + Var PD_CODE1 = "12-02-02-0012" + Var PD_CODE2 = "12-02-01-0012" + Var PD_CODE3 = "12-02-03-0012" + Var PD_STAGE_1 = $12-02-02-0012.Button + Var PD_STAGE_2 = $12-02-01-0012.Button + Var PD_STAGE_3 = $12-02-03-0012.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2962,6 +3124,15 @@ LIMENADE" Var PriceD1 = $12-02-01-0019.Price Var PriceD2 = $12-02-02-0019.Price Var PriceD3 = $12-02-03-0019.Price + Var PD_CODE1 = "12-02-01-0019" + Var PD_CODE2 = "12-02-02-0019" + Var PD_CODE3 = "12-02-03-0019" + Var PD_STAGE_1 = $12-02-01-0019.Button + Var PD_STAGE_2 = $12-02-02-0019.Button + Var PD_STAGE_3 = $12-02-03-0019.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3092,6 +3263,15 @@ LIMENADE" Var PriceD1 = $12-02-01-0022.Price Var PriceD2 = $12-02-02-0022.Price Var PriceD3 = $12-02-03-0022.Price + Var PD_CODE1 = "12-02-01-0022" + Var PD_CODE2 = "12-02-02-0022" + Var PD_CODE3 = "12-02-03-0022" + Var PD_STAGE_1 = $12-02-01-0022.Button + Var PD_STAGE_2 = $12-02-02-0022.Button + Var PD_STAGE_3 = $12-02-03-0022.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3224,6 +3404,15 @@ Water, Ice" Var PriceD1 = $12-02-01-0017.Price Var PriceD2 = $12-05-02-0027.Price Var PriceD3 = $12-05-03-0027.Price + Var PD_CODE1 = "12-02-01-0017" + Var PD_CODE2 = "12-05-02-0027" + Var PD_CODE3 = "12-05-03-0027" + Var PD_STAGE_1 = $12-02-01-0017.Button + Var PD_STAGE_2 = $12-05-02-0027.Button + Var PD_STAGE_3 = $12-05-03-0027.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3355,6 +3544,15 @@ Water, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-02-02-0029.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-02-02-0029" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-02-02-0029.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3485,6 +3683,15 @@ Water, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-02-02-0030.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-02-02-0030" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-02-02-0030.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3616,6 +3823,15 @@ LIMENADE" Var PriceD1 = $12-02-01-0031.Price Var PriceD2 = $12-02-02-0031.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-02-01-0031" + Var PD_CODE2 = "12-02-02-0031" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-02-01-0031.Button + Var PD_STAGE_2 = $12-02-02-0031.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3747,6 +3963,15 @@ LIMENADE" Var PriceD1 = $12-02-01-0031.Price Var PriceD2 = $12-02-02-0032.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-02-01-0031" + Var PD_CODE2 = "12-02-02-0032" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-02-01-0031.Button + Var PD_STAGE_2 = $12-02-02-0032.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3880,6 +4105,15 @@ Water, and Ice" Var PriceD1 = $12-02-01-0016.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-02-01-0016" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-02-01-0016.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml index 0951d072..860d4feb 100644 --- a/xml/page_catalog_group_whey.xml +++ b/xml/page_catalog_group_whey.xml @@ -620,6 +620,15 @@ Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0001.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0001" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0001.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -751,6 +760,15 @@ Matcha, and Milk" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0016.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0016" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0016.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -882,6 +900,15 @@ Matcha, and Milk" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0002.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0002" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0002.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1013,6 +1040,15 @@ Cocoa, and Milk" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0003.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0003" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0003.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1146,6 +1182,15 @@ Strawberry Syrup" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0013.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0013" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0013.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1279,6 +1324,15 @@ Strawberry Syrup" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0004.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0004" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0004.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1410,6 +1464,15 @@ and Milk" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0005.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0005" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0005.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1541,6 +1604,15 @@ Thai Tea, and Milk" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0015.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0015" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0015.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1672,6 +1744,15 @@ Thai Tea, and Milk" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0006.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0006" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0006.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1805,6 +1886,15 @@ Kokuto syrup" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0007.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0007" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0007.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1937,6 +2027,15 @@ Blueberry Syrup and Milk" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0008.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0008" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0008.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2070,6 +2169,15 @@ Taiwanese Tea, Sugar" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0017.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0017" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0017.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2203,6 +2311,15 @@ Taiwanese Tea, Sugar" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0009.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0009" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0009.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2335,6 +2452,15 @@ Caramel Syrup" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0010.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0010" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0010.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2465,6 +2591,15 @@ Caramel Syrup" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0011.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0011" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0011.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml index 1f88d05d..411a5b79 100644 --- a/xml/page_topping_select4.xml +++ b/xml/page_topping_select4.xml @@ -156,11 +156,6 @@ EndIf EndIf - DEBUGVAR GetFreeFromError - If GetFreeFromError = 1 Then - Var btnAddCart = "Invisible" - EndIf - Var LidDeactiveButton = "Invisible" Var StrawDeactiveButton = "Invisible" @@ -176,6 +171,11 @@ If new_layout = "true" Then Var show_select_type = "Enable" + + Var hot_button_state = PD_STAGE_1 + Var cold_button_state = PD_STAGE_2 + Var blend_button_state = PD_STAGE_3 + Else Var show_select_type = "Invisible" EndIf @@ -184,6 +184,14 @@ DEBUGVAR PriceD1 DEBUGVAR PriceD2 DEBUGVAR PriceD3 + DEBUGVAR PD_CODE1 + DEBUGVAR PD_CODE2 + DEBUGVAR PD_CODE3 + DEBUGVAR PD_STAGE_1 + DEBUGVAR PD_STAGE_2 + DEBUGVAR PD_STAGE_3 + + @@ -875,10 +883,12 @@ @@ -911,22 +962,35 @@