Merge 56e0e70 into 62c3715

aimeos · Jun 19, 2019 · e240f66 · e240f66
2 parents 62c3715 + 56e0e70
commit e240f66
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 2 deletions.
diff --git a/lib/mshoplib/src/MShop/Service/Provider/Delivery/Manual.php b/lib/mshoplib/src/MShop/Service/Provider/Delivery/Manual.php
@@ -29,7 +29,18 @@ class Manual
 	 */
 	public function process( \Aimeos\MShop\Order\Item\Iface $order )
 	{
-		$order->setDeliveryStatus( \Aimeos\MShop\Order\Item\Base::STAT_PROGRESS );
+		/** mshop/service/provider/delivery/auto-status
+		 * Set delivery status to STAT_PROGRESS automatically when the
+		 * payment is confirmed (authorized or recieved status).
+		 *
+		 * @param bool Set delivery status automatically
+		 * @since 2018.10
+		 * @category Developer
+		 */
+		if( $this->getContext()->getConfig()->get( 'mshop/service/provider/delivery/auto-status', 1 ) )
+		{
+			$order->setDeliveryStatus( \Aimeos\MShop\Order\Item\Base::STAT_PROGRESS );
+		}
 	}
 
 }
diff --git a/lib/mshoplib/src/MShop/Service/Provider/Delivery/Standard.php b/lib/mshoplib/src/MShop/Service/Provider/Delivery/Standard.php
@@ -92,7 +92,18 @@ public function process( \Aimeos\MShop\Order\Item\Iface $order )
 
 		$this->checkResponse( $response, $order->getId() );
 
-		$order->setDeliveryStatus( \Aimeos\MShop\Order\Item\Base::STAT_PROGRESS );
+		/** mshop/service/provider/delivery/auto-status
+		 * Set delivery status to STAT_PROGRESS automatically when the
+		 * payment is confirmed (authorized or recieved status).
+		 *
+		 * @param bool Set delivery status automatically
+		 * @since 2018.10
+		 * @category Developer
+		 */
+		if( $this->getContext()->getConfig()->get( 'mshop/service/provider/delivery/auto-status', 1 ) )
+		{
+			$order->setDeliveryStatus( \Aimeos\MShop\Order\Item\Base::STAT_PROGRESS );
+		}
 	}