Actually add cart restore functionality (oops)

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.5 - 2019-06-25
+### Added
+- Actually add cart restore functionality (oops).
+
 ## 1.0.4 - 2019-06-24
 ### Added
 - Added alert to the Mailchimp CP section telling the user that syncing is disabled (if it is).

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "ether/mailchimp-commerce",
   "description": "Mailchimp integration with Craft Commerce",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "type": "craft-plugin",
   "keywords": [
     "mailchimp",

src/controllers/OrderController.php

@@ -9,7 +9,12 @@
 namespace ether\mc\controllers;
 
 use Craft;
+use craft\commerce\Plugin as Commerce;
+use craft\errors\MissingComponentException;
 use craft\web\Controller;
+use ether\mc\MailchimpCommerce;
+use yii\web\BadRequestHttpException;
+use yii\web\Response;
 
 /**
  * Class OrderController
@@ -20,12 +25,41 @@
 class OrderController extends Controller
 {
 
+	protected $allowAnonymous = true;
+
+	/**
+	 * Attempts to restore an abandoned cart
+	 *
+	 * @return Response
+	 * @throws MissingComponentException
+	 * @throws BadRequestHttpException
+	 */
 	public function actionRestore ()
 	{
+		$commerce = Commerce::getInstance();
+		$settings = MailchimpCommerce::getInstance()->getSettings();
+		$session = Craft::$app->getSession();
+
 		$number = Craft::$app->getRequest()->getRequiredBodyParam('number');
+		$order = $commerce->getOrders()->getOrderByNumber($number);
+
+		if (!$order)
+		{
+			$session->setError($settings->expiredCartError);
+			return $this->redirect($settings->abandonedCartRestoreUrl);
+		}
+
+		if ($order->isCompleted)
+		{
+			$session->setError($settings->completedCartError);
+			return $this->redirect($settings->abandonedCartRestoreUrl);
+		}
+
+		$commerce->getCarts()->forgetCart();
+		$session->set('commerce_cart', $number);
 
-		// TODO: Set order to be active cart, redirect to checkout
-		//   (will need setting for checkout url)
+		$session->setNotice($settings->cartRestoredNotice);
+		return $this->redirect($settings->abandonedCartRestoreUrl);
 	}
 
-}
+}

src/models/Settings.php

@@ -83,6 +83,22 @@ class Settings extends Model
 	 */
 	public $abandonedCartRestoreUrl;
 
+	/**
+	 * @var string The error notice sent when an abandoned cart has expired.
+	 */
+	public $expiredCartError = 'Your cart has expired!';
+
+	/**
+	 * @var string The error notice sent when an abandoned cart that has
+	 *             already been completed is attempted to be restored.
+	 */
+	public $completedCartError = 'You\'ve already completed this order!';
+
+	/**
+	 * @var string The success notice sent when an abandoned cart is restored.
+	 */
+	public $cartRestoredNotice = 'Your cart has been restored!';
+
 	// Products
 	// -------------------------------------------------------------------------
 

src/templates/_settings.twig

@@ -51,6 +51,27 @@
 			placeholder: 'i.e. /cart',
 		}) }}
 
+		{{ forms.textField({
+			name: 'expiredCartError',
+			label: 'Expired Cart Error'|t('mailchimp-commerce'),
+			instructions: 'The error notice sent when an abandoned cart has expired.'|t('mailchimp-commerce'),
+			value: settings.expiredCartError,
+		}) }}
+
+		{{ forms.textField({
+			name: 'completedCartError',
+			label: 'Completed Cart Error'|t('mailchimp-commerce'),
+			instructions: 'The error notice sent when an abandoned cart that has already been completed is attempted to be restored.'|t('mailchimp-commerce'),
+			value: settings.completedCartError,
+		}) }}
+
+		{{ forms.textField({
+			name: 'cartRestoredNotice',
+			label: 'Cart Restored Notice'|t('mailchimp-commerce'),
+			instructions: 'The success notice sent when an abandoned cart is restored.'|t('mailchimp-commerce'),
+			value: settings.cartRestoredNotice,
+		}) }}
+
 	{% endnamespace %}
 
 {% endblock %}

src/translations/en/mailchimp-commerce.php

@@ -61,6 +61,17 @@
 	'The URL that will be redirected to after an abandoned cart is restored.' =>
 		'The URL that will be redirected to after an abandoned cart is restored.',
 
+	'Expired Cart Error' => 'Expired Cart Error',
+	'The error notice sent when an abandoned cart has expired.' => 'The error notice sent when an abandoned cart has expired.',
+
+	'Completed Cart Error' => 'Completed Cart Error',
+	'The error notice sent when an abandoned cart that has already been completed is attempted to be restored.' =>
+		'The error notice sent when an abandoned cart that has already been completed is attempted to be restored.',
+
+	'Cart Restored Notice' => 'Cart Restored Notice',
+	'The success notice sent when an abandoned cart is restored.' => 'The success notice sent when an abandoned cart is restored.',
+
+
 	// Jobs
 	// =========================================================================