antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket-10133' into develop

Browse Source
This commit is contained in:
Marion Muszynski 2016-09-15 10:52:08 +02:00
commit dbcbfacae3
1 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/loyalty/loyalty.php
View File

@ -666,7 +666,7 @@ class Loyalty extends Module
if ((int)Configuration::get('PS_LOYALTY_NONE_AWARD') AND $loyalty->id_loyalty_state == LoyaltyStateModule::getNoneAwardId()) if ((int)Configuration::get('PS_LOYALTY_NONE_AWARD') AND $loyalty->id_loyalty_state == LoyaltyStateModule::getNoneAwardId())
return true; return true;
if ($newOrder->id == $this->loyaltyStateValidation->id_order_state) if ($newOrder->id == $this->loyaltyStateValidation->id_order_state && $loyalty->id_loyalty_state != LoyaltyStateModule::getCancelId())
{ {
$loyalty->id_loyalty_state = LoyaltyStateModule::getValidationId(); $loyalty->id_loyalty_state = LoyaltyStateModule::getValidationId();
if ((float)($loyalty->discount_value) == 0) { if ((float)($loyalty->discount_value) == 0) {