[*] Registration type is now in 2 steps or all in one

// refactoring AuthController.php (front)
This commit is contained in:
vChabot
2011-09-30 15:48:20 +00:00
parent 8ce076c617
commit 372c8dac4e
10 changed files with 711 additions and 495 deletions
@@ -454,5 +454,37 @@ class ParentOrderControllerCore extends FrontController
return 0;
}
/**
* Decides what the default carrier is and update the cart with it
*
* @param array $carriers
* @return number the id of the default carrier
*/
protected function _setDefaultCarrierSelection($carriers)
{
if (count($carriers))
{
$defaultCarrierIsPresent = false;
if ((int)self::$cart->id_carrier != 0)
foreach ($carriers as $carrier)
if ($carrier['id_carrier'] == (int)self::$cart->id_carrier)
$defaultCarrierIsPresent = true;
if (!$defaultCarrierIsPresent)
foreach ($carriers as $carrier)
if ($carrier['id_carrier'] == (int)Configuration::get('PS_CARRIER_DEFAULT'))
{
$defaultCarrierIsPresent = true;
self::$cart->id_carrier = (int)$carrier['id_carrier'];
}
if (!$defaultCarrierIsPresent)
self::$cart->id_carrier = (int)$carriers[0]['id_carrier'];
}
else
self::$cart->id_carrier = 0;
if (self::$cart->update())
return self::$cart->id_carrier;
return 0;
}
}