Index: branches/5.3.x/units/helpers/order_helper.php =================================================================== diff -u -N -r15492 -r16506 --- branches/5.3.x/units/helpers/order_helper.php (.../order_helper.php) (revision 15492) +++ branches/5.3.x/units/helpers/order_helper.php (.../order_helper.php) (revision 16506) @@ -169,15 +169,33 @@ } /** - * Detects credit card type by it's number + * Detects credit card type by it's number. * - * @param string $number - * @return int - * @access public + * @param string $number Credit card number. + * + * @return integer + * @deprecated */ public function getCreditCartType($number) { - // Get rid of any non-digits + @trigger_error( + 'Usage of deprecated method OrderHelper::getCreditCartType. Use OrderHelper::getCreditCardType.', + E_USER_DEPRECATED + ); + + return $this->getCreditCardType($number); + } + + /** + * Detects credit card type by it's number. + * + * @param string $number Credit card number. + * + * @return integer + */ + public function getCreditCardType($number) + { + // Get rid of any non-digits. $number = preg_replace('/[^\d]/', '', $number); $mapping = Array ( Index: branches/5.3.x/install/upgrades.sql =================================================================== diff -u -N -r16369 -r16506 --- branches/5.3.x/install/upgrades.sql (.../upgrades.sql) (revision 16369) +++ branches/5.3.x/install/upgrades.sql (.../upgrades.sql) (revision 16506) @@ -296,6 +296,8 @@ # ===== v 5.2.1 ===== +# ===== v 5.2.2-B1 ===== + # ===== v 5.3.0-B1 ===== ALTER TABLE Affiliates DROP SSN; DELETE FROM LanguageLabels WHERE PhraseKey IN ('LA_FLD_SSN', 'LU_COMM_SSNFIELD', 'LU_FLD_SSNFIELD'); Index: branches/5.3.x/units/shipping_quote_engines/shipping_quote_engine_event_handler.php =================================================================== diff -u -N -r15492 -r16506 --- branches/5.3.x/units/shipping_quote_engines/shipping_quote_engine_event_handler.php (.../shipping_quote_engine_event_handler.php) (revision 15492) +++ branches/5.3.x/units/shipping_quote_engines/shipping_quote_engine_event_handler.php (.../shipping_quote_engine_event_handler.php) (revision 16506) @@ -1,6 +1,6 @@ Name == 'OnMassApprove' ) { - $event->status = kEvent::erSUCCESS; - $event->redirect = true; - } - } - - /** * Sets virtual fields from serialized properties array * * @param kEvent $event @@ -155,4 +138,4 @@ WHERE VarName LIKE "ShippingQuotes%"'; $this->Conn->Query($sql); } -} \ No newline at end of file +} Index: branches/5.3.x/install.php =================================================================== diff -u -N -r15899 -r16506 --- branches/5.3.x/install.php (.../install.php) (revision 15899) +++ branches/5.3.x/install.php (.../install.php) (revision 16506) @@ -1,6 +1,6 @@ RunSQL('/' . $module_folder . '/install/install_schema.sql'); $toolkit->RunSQL('/' . $module_folder . '/install/install_data.sql', '{ProductCatId}', $category->GetID()); -$toolkit->ImportLanguage('/' . $module_folder . '/install/english'); +$toolkit->ImportLanguage('/' . $module_folder . '/install/english', isset($constants_file)); $toolkit->SetModuleRootCategory(basename($module_folder), $category->GetID()); Index: branches/5.3.x/units/orders/orders_event_handler.php =================================================================== diff -u -N -r16398 -r16506 --- branches/5.3.x/units/orders/orders_event_handler.php (.../orders_event_handler.php) (revision 16398) +++ branches/5.3.x/units/orders/orders_event_handler.php (.../orders_event_handler.php) (revision 16506) @@ -1,6 +1,6 @@ Name == 'OnUpdate' ) { - // all checks were ok -> it's user's order -> allow to modify - return true; - } } } } @@ -128,7 +123,9 @@ 'OnSelectAddress' => Array('self' => true), 'OnProceedToBilling' => Array('self' => true), 'OnProceedToPreview' => Array('self' => true), + 'OnProceedToPreviewAjax' => array('self' => true), 'OnCompleteOrder' => Array('self' => true), + 'OnUpdate' => array('self' => true), 'OnUpdateAjax' => Array('self' => true), 'OnRemoveCoupon' => Array('self' => true), @@ -524,8 +521,15 @@ WHERE '. $config->getIDField() .' = '.$order_id; $this->Conn->Query($sql); + // Remember order ID for use on "Thank You" page. $this->Application->StoreVar('front_order_id', $order_id); + + // Remove globals, set from "_createNewCart" method. + $this->Application->DeleteVar('ord_id'); $this->Application->RemoveVar('ord_id'); + + // Prevent accidental access to non-Incomplete order. + $this->Application->removeObject($event->getPrefixSpecial()); $this->Application->Session->SetCookie('shop_cart_cookie', '', strtotime('-1 month')); } @@ -2541,7 +2545,10 @@ $order_helper = $this->Application->recallObject('OrderHelper'); /* @var $order_helper OrderHelper */ - $object->SetDBField('PaymentCardType', $order_helper->getCreditCartType($object->GetDBField('PaymentAccount'))); + $object->SetDBField( + 'PaymentCardType', + $order_helper->getCreditCardType($object->GetDBField('PaymentAccount')) + ); } else { $object->SetDBField('PaymentCardType', ''); @@ -4103,13 +4110,29 @@ /** * Performs order update and returns results in format, needed by FormManager * - * @param kEvent $event + * @param kEvent $event Event. + * + * @return void */ - function OnUpdateAjax($event) + protected function OnUpdateAjax(kEvent $event) { + /** @var AjaxFormHelper $ajax_form_helper */ $ajax_form_helper = $this->Application->recallObject('AjaxFormHelper'); - /* @var $ajax_form_helper AjaxFormHelper */ - $ajax_form_helper->transitEvent($event, 'OnUpdate'); } + + /** + * Performs order update after billing step submission and returns results in format, needed by FormManager + * + * @param kEvent $event Event. + * + * @return void + */ + protected function OnProceedToPreviewAjax(kEvent $event) + { + /** @var AjaxFormHelper $ajax_form_helper */ + $ajax_form_helper = $this->Application->recallObject('AjaxFormHelper'); + $ajax_form_helper->transitEvent($event, 'OnProceedToPreview'); + } + } Index: branches/5.3.x/install/upgrades.php =================================================================== diff -u -N -r16106 -r16506 --- branches/5.3.x/install/upgrades.php (.../upgrades.php) (revision 16106) +++ branches/5.3.x/install/upgrades.php (.../upgrades.php) (revision 16506) @@ -1,6 +1,6 @@ Array ('Core' => '5.2.1-B2'), '5.2.1-RC1' => Array ('Core' => '5.2.1-RC1'), '5.2.1' => Array ('Core' => '5.2.1'), + '5.2.2-B1' => Array ('Core' => '5.2.2-B1'), '5.3.0-B1' => Array ('Core' => '5.3.0-B1'), ); } @@ -191,4 +192,4 @@ $this->Conn->Query($sql); } } - } \ No newline at end of file + } Index: branches/5.3.x/units/affiliates/affiliates_event_handler.php =================================================================== diff -u -N -r16106 -r16506 --- branches/5.3.x/units/affiliates/affiliates_event_handler.php (.../affiliates_event_handler.php) (revision 16106) +++ branches/5.3.x/units/affiliates/affiliates_event_handler.php (.../affiliates_event_handler.php) (revision 16506) @@ -1,6 +1,6 @@ status = kEvent::erSUCCESS; $event->SetRedirectParam('opener', 's'); //stay! } - else { - $event->status = kEvent::erFAIL; - $event->redirect = false; - break; - } } } }