Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece
This commit is contained in:
commit
c72eba6b87
214 changed files with 32239 additions and 1842 deletions
|
|
@ -129,11 +129,15 @@ Var Seeker.BuyMomCocoaProFlag = 0
|
|||
Var RobinsonBeautyPro = 0
|
||||
Var FromRobinsonBeautyPro = 0
|
||||
|
||||
; Enable Jemila promotion, 1 - 18 Oct
|
||||
; Enable Jemila promotion, 1 - 25 Oct
|
||||
Var JemilaPro = 0
|
||||
Var FromJemilaPro = 0
|
||||
Var JemilaRewardOutOfStock = 0
|
||||
|
||||
; Halloween promotion, 21 Oct - 3 Nov
|
||||
Var HalloweenPro = 0
|
||||
Var FromHalloweenPro = 0
|
||||
|
||||
Var NewCollectPoint = 1
|
||||
Var PayMentCodeShouldCollectPromotionPoint = 0
|
||||
Var NotCollectPointPromotion = 0
|
||||
|
|
@ -205,9 +209,19 @@ If SystemDateMonthInt = 9 Then
|
|||
EndIf
|
||||
|
||||
If SystemDateMonthInt = 10 Then
|
||||
If SystemDateDayInt <= 18 Then
|
||||
If SystemDateDayInt <= 25 Then
|
||||
Var JemilaPro = 1
|
||||
EndIf
|
||||
|
||||
If SystemDateDayInt >= 21 Then
|
||||
Var HalloweenPro = 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If SystemDateMonthInt = 11 Then
|
||||
If SystemDateDayInt <= 3 Then
|
||||
Var HalloweenPro = 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -222,6 +236,7 @@ If BoxID = 105005 Then
|
|||
Var MomCocoaProDiscountEnable = 0
|
||||
Var RobinsonBeautyPro = 0
|
||||
Var JemilaPro = 1
|
||||
Var HalloweenPro = 1
|
||||
EndIf
|
||||
|
||||
If BoxID = 172331 Then
|
||||
|
|
@ -272,7 +287,6 @@ If BoxID = 173149 Then
|
|||
Var RobinsonBeautyPro = 0
|
||||
Var JemilaPro = 1
|
||||
EndIf
|
||||
DEBUGVAR JemilaPro
|
||||
|
||||
|
||||
Var XMLLiveInfoEnable = 1
|
||||
|
|
@ -349,6 +363,7 @@ If taobin_nopro = "true" Then
|
|||
Var MomCocoaPro = 0
|
||||
Var RobinsonBeautyPro = 0
|
||||
Var JemilaPro = 0
|
||||
Var HalloweenPro = 0
|
||||
|
||||
Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
|
||||
|
||||
|
|
@ -381,7 +396,11 @@ EndIf
|
|||
If 7UpSyrupEnable = "true" Then
|
||||
|
||||
Else
|
||||
Var 7UpLuckyDrawX2Pro = 0
|
||||
If PepsiHighYSyrupEnable = "true" Then
|
||||
|
||||
Else
|
||||
Var HalloweenPro = 0
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
If MintSyrupEnable = "true" Then
|
||||
|
|
@ -410,6 +429,11 @@ DEBUGVAR JemilaRewardOutOfStock
|
|||
Var New_Payment = 0
|
||||
Var NewFlowPaymentCode = 0
|
||||
|
||||
If BoxID = 105005 Then
|
||||
Var New_Payment = 1
|
||||
Var NewFlowPaymentCode = 1
|
||||
EndIf
|
||||
|
||||
If BoxID = 173149 Then
|
||||
Var New_Payment = 1
|
||||
Var NewFlowPaymentCode = 1
|
||||
|
|
@ -462,3 +486,10 @@ If BoxID = 176757 Then
|
|||
Var SaveOrderNameAndPictureEnable = 1
|
||||
EndIf
|
||||
|
||||
; Check POS machine flag
|
||||
Var ConnectWithPOSMachine = 0
|
||||
|
||||
READ_FILE "/mnt/sdcard/coffeevending/POS_MACHINE" POSMachineFlag
|
||||
If POSMachineFlag = 1 Then
|
||||
Var ConnectWithPOSMachine = 1
|
||||
EndIf
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue