-
Notifications
You must be signed in to change notification settings - Fork 515
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #63 from rohit053/v1.3.2
V1.3.2 released: Guest Checkout, New Designed Checkout Page, Custom CMS Link, Data Cleaner module
- Loading branch information
Showing
528 changed files
with
41,049 additions
and
4,031 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| <?php | ||
| /** | ||
| * 2007-2018 PrestaShop | ||
| * | ||
| * NOTICE OF LICENSE | ||
| * | ||
| * This source file is subject to the Open Software License (OSL 3.0) | ||
| * that is bundled with this package in the file LICENSE.txt. | ||
| * It is also available through the world-wide-web at this URL: | ||
| * https://opensource.org/licenses/OSL-3.0 | ||
| * If you did not receive a copy of the license and are unable to | ||
| * obtain it through the world-wide-web, please send an email | ||
| * to [email protected] so we can send you a copy immediately. | ||
| * | ||
| * DISCLAIMER | ||
| * | ||
| * Do not edit or add to this file if you wish to upgrade PrestaShop to newer | ||
| * versions in the future. If you wish to customize PrestaShop for your | ||
| * needs please refer to http://www.prestashop.com for more information. | ||
| * | ||
| * @author PrestaShop SA <[email protected]> | ||
| * @copyright 2007-2018 PrestaShop SA | ||
| * @license https://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0) | ||
| * International Registered Trademark & Property of PrestaShop SA | ||
| */ | ||
|
|
||
| abstract class AbstractCheckoutStep implements CheckoutStepInterface | ||
| { | ||
| public $step_is_reachable = 0; | ||
| public $step_is_complete = 0; | ||
| public $step_is_current = 0; | ||
| public $step_key; | ||
| private $checkoutProcess; | ||
|
|
||
| public function __construct() | ||
| { | ||
| $this->context = Context::getContext(); | ||
| } | ||
|
|
||
| public function setCheckoutProcess(CheckoutProcess $checkoutProcess) | ||
| { | ||
| $this->checkoutProcess = $checkoutProcess; | ||
|
|
||
| return $this; | ||
| } | ||
|
|
||
| public function setReachable($step_is_reachable) | ||
| { | ||
| $this->step_is_reachable = $step_is_reachable; | ||
|
|
||
| return $this; | ||
| } | ||
|
|
||
| public function isReachable() | ||
| { | ||
| return $this->step_is_reachable; | ||
| } | ||
|
|
||
| public function setComplete($step_is_complete) | ||
| { | ||
| $this->step_is_complete = $step_is_complete; | ||
|
|
||
| return $this; | ||
| } | ||
|
|
||
| public function isComplete() | ||
| { | ||
| return $this->step_is_complete; | ||
| } | ||
|
|
||
| public function setCurrent($step_is_current) | ||
| { | ||
| $this->step_is_current = $step_is_current; | ||
|
|
||
| return $this; | ||
| } | ||
|
|
||
| public function isCurrent() | ||
| { | ||
| return $this->step_is_current; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| <?php | ||
| /** | ||
| * 2010-2018 Webkul. | ||
| * | ||
| * NOTICE OF LICENSE | ||
| * | ||
| * All right is reserved, | ||
| * Please go through this link for complete license : https://store.webkul.com/license.html | ||
| * | ||
| * DISCLAIMER | ||
| * | ||
| * Do not edit or add to this file if you wish to upgrade this module to newer | ||
| * versions in the future. If you wish to customize this module for your | ||
| * needs please refer to https://store.webkul.com/customisation-guidelines/ for more information. | ||
| * | ||
| * @author Webkul IN <[email protected]> | ||
| * @copyright 2010-2018 Webkul IN | ||
| * @license https://store.webkul.com/license.html | ||
| */ | ||
|
|
||
| class CheckoutCartSummaryStep extends AbstractCheckoutStep | ||
| { | ||
| public function __construct() { | ||
| parent::__construct(); | ||
| $this->step_key = 'checkout_rooms_summary'; | ||
| } | ||
|
|
||
| public function handleRequest() | ||
| { | ||
| // set data in checkout_session cookie | ||
| if (Tools::getValue('proceed_to_customer_dtl')) { | ||
| $this->step_is_reachable = 1; | ||
| $this->step_is_complete = 1; | ||
| $this->step_is_current = 0; | ||
| $this->context->cookie->__set('cart_summary_proceeded', 1); | ||
| } elseif ($this->context->cookie->__get('cart_summary_proceeded')) { | ||
| $this->step_is_reachable = 1; | ||
| $this->step_is_complete = 1; | ||
| $this->step_is_current = 0; | ||
| } | ||
|
|
||
| return $this; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| <?php | ||
| /** | ||
| * 2010-2018 Webkul. | ||
| * | ||
| * NOTICE OF LICENSE | ||
| * | ||
| * All right is reserved, | ||
| * Please go through this link for complete license : https://store.webkul.com/license.html | ||
| * | ||
| * DISCLAIMER | ||
| * | ||
| * Do not edit or add to this file if you wish to upgrade this module to newer | ||
| * versions in the future. If you wish to customize this module for your | ||
| * needs please refer to https://store.webkul.com/customisation-guidelines/ for more information. | ||
| * | ||
| * @author Webkul IN <[email protected]> | ||
| * @copyright 2010-2018 Webkul IN | ||
| * @license https://store.webkul.com/license.html | ||
| */ | ||
|
|
||
| class CheckoutCustomerDetailsStep extends AbstractCheckoutStep | ||
| { | ||
| public function __construct() { | ||
| parent::__construct(); | ||
| $this->step_key = 'checkout_customer'; | ||
| } | ||
|
|
||
| public function handleRequest() | ||
| { | ||
| $idAddressDelivery = $this->context->cart->id_address_delivery; | ||
| $objAddress = new Address($idAddressDelivery); | ||
| if (Tools::getValue('proceed_to_customer_dtl')) { | ||
| $this->step_is_reachable = 1; | ||
| $this->step_is_current = 1; | ||
| if ($idAddressDelivery) { | ||
| if (!Validate::isLoadedObject($objAddress)) { | ||
| if ($this->context->cookie->__get('customer_details_proceeded')) { | ||
| $this->step_is_current = 0; | ||
| $this->step_is_complete = 1; | ||
| } | ||
| } | ||
| } | ||
| } elseif (Tools::getValue('proceed_to_payment')) { | ||
| $this->step_is_reachable = 1; | ||
| $this->step_is_current = 1; | ||
| if ($idAddressDelivery) { | ||
| if (Validate::isLoadedObject($objAddress)) { | ||
| $this->step_is_current = 0; | ||
| $this->step_is_complete = 1; | ||
| $this->context->cookie->__set('customer_details_proceeded', 1); | ||
| } | ||
| } | ||
| } elseif ($this->context->cookie->__get('customer_details_proceeded') | ||
| || $this->context->cookie->__get('cart_summary_proceeded') | ||
| ) { | ||
| if ($idAddressDelivery) { | ||
| if (!Validate::isLoadedObject($objAddress)) { | ||
| $this->context->cookie->__set('customer_details_proceeded', 0); | ||
| $this->step_is_reachable = 1; | ||
| $this->step_is_current = 1; | ||
| } | ||
| } else { | ||
| $this->step_is_reachable = 1; | ||
| $this->step_is_current = 1; | ||
| $this->context->cookie->__set('customer_details_proceeded', 0); | ||
| } | ||
| } elseif ($this->context->customer->logged) { | ||
| $this->step_is_reachable = 1; | ||
| if ($idAddressDelivery) { | ||
| $this->step_is_complete = 1; | ||
| } else { | ||
| $this->step_is_complete = 0; | ||
| $this->step_is_current = 1; | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| <?php | ||
| /** | ||
| * 2010-2018 Webkul. | ||
| * | ||
| * NOTICE OF LICENSE | ||
| * | ||
| * All right is reserved, | ||
| * Please go through this link for complete license : https://store.webkul.com/license.html | ||
| * | ||
| * DISCLAIMER | ||
| * | ||
| * Do not edit or add to this file if you wish to upgrade this module to newer | ||
| * versions in the future. If you wish to customize this module for your | ||
| * needs please refer to https://store.webkul.com/customisation-guidelines/ for more information. | ||
| * | ||
| * @author Webkul IN <[email protected]> | ||
| * @copyright 2010-2018 Webkul IN | ||
| * @license https://store.webkul.com/license.html | ||
| */ | ||
|
|
||
| class CheckoutPaymentStep extends AbstractCheckoutStep | ||
| { | ||
| public function __construct() { | ||
| parent::__construct(); | ||
| $this->step_key = 'checkout_payment'; | ||
| } | ||
|
|
||
| public function handleRequest() | ||
| { | ||
| if ($this->context->cookie->__get('customer_details_proceeded')) { | ||
| $this->step_is_reachable = 1; | ||
| $this->step_is_current = 1; | ||
| $this->step_is_complete = 0; | ||
| } | ||
| } | ||
| } | ||
|
|
Oops, something went wrong.