Added shipping and payment status to orders list and order page

givanz · givanz · commit 8e6c9723010f · 2024-08-06T02:01:33.000+03:00
diff --git a/admin/controller/order/order.php b/admin/controller/order/order.php
@@ -23,11 +23,13 @@
 namespace Vvveb\Controller\Order;
 
 use function Vvveb\__;
-use function Vvveb\email;
 use Vvveb\Controller\Base;
 use Vvveb\Controller\Content\AutocompleteTrait;
+use function Vvveb\email;
 use function Vvveb\orderStatusBadgeClass;
+use function Vvveb\paymentStatusBadgeClass;
 use function Vvveb\prefixArrayKeys;
+use function Vvveb\shippingStatusBadgeClass;
 use function Vvveb\siteSettings;
 use Vvveb\Sql\Order_LogSQL;
 use Vvveb\Sql\OrderSQL;
@@ -112,6 +114,8 @@ function index() {
 				$order['shipping_data']   = json_decode($order['shipping_data'] ?? '', true);
 				$order['payment_data']    = json_decode($order['payment_data'] ?? '', true);
 				$order['class']           = orderStatusBadgeClass($order['order_status_id']);
+				$order['payment_class']   = paymentStatusBadgeClass($order['payment_status_id']);
+				$order['shipping_class']  = shippingStatusBadgeClass($order['shipping_status_id']);
 
 				$order += prefixArrayKeys('shipping_', $order['shipping_data']) ?? [];
 				$order += prefixArrayKeys('payment_', $order['payment_data']) ?? [];
@@ -214,14 +218,14 @@ function saveLog() {
 					
 					if ($notify) {
 						$message = '';
+
 						if ($public) { 
 							$message = $log['note'];
 						}
 						
 						$email = $this->view->order['email'];
 						$this->sendNotification($order_id, $email, $message);
 					}
-					
 				} else {
 					$view->errors[] = $orderLog->error;
 				}
diff --git a/admin/controller/order/orders.php b/admin/controller/order/orders.php
@@ -25,6 +25,8 @@
 use function Vvveb\__;
 use Vvveb\Controller\Base;
 use function Vvveb\orderStatusBadgeClass;
+use function Vvveb\paymentStatusBadgeClass;
+use function Vvveb\shippingStatusBadgeClass;
 use Vvveb\Sql\OrderSQL;
 use Vvveb\System\Cart\Currency;
 use Vvveb\System\Core\View;
@@ -71,6 +73,8 @@ function index() {
 			foreach ($results['order'] as $id => &$order) {
 				$order['total_formatted'] = $currency->format($order['total']);
 				$order['class']           = orderStatusBadgeClass($order['order_status_id']);
+				$order['payment_class']   = paymentStatusBadgeClass($order['payment_status_id']);
+				$order['shipping_class']  = shippingStatusBadgeClass($order['shipping_status_id']);
 				$order['delete-url']      = \Vvveb\url(['module' => 'order/orders', 'action' => 'delete'] + ['order_id[]' => $order['order_id']]);
 			}
 		}
diff --git a/admin/sql/mysqli/order.sql b/admin/sql/mysqli/order.sql
@@ -6,7 +6,7 @@
 		-- variables
 		IN  language_id INT,
 		IN  site_id INT,
-		IN 	user_id INT
+		IN  user_id INT
 		
 		IN order_status CHAR,
 		IN order_status_id INT,
@@ -32,7 +32,7 @@
 	)
 	BEGIN
         
-        SELECT `order`.*,os.name as order_status FROM `order` AS `order`
+        SELECT `order`.*,os.name as order_status,ops.name as payment_status,oss.name as shipping_status FROM `order` AS `order`
 		
 			LEFT JOIN order_status AS os ON (`order`.order_status_id = os.order_status_id AND os.language_id = :language_id) 
 			LEFT JOIN shipping_status AS oss ON (`order`.shipping_status_id = oss.shipping_status_id AND oss.language_id = :language_id) 
diff --git a/admin/sql/pgsql/order.sql b/admin/sql/pgsql/order.sql
@@ -6,7 +6,7 @@
 		-- variables
 		IN  language_id INT,
 		IN  site_id INT,
-		IN 	user_id INT
+		IN  user_id INT
 		
 		IN order_status CHAR,
 		IN order_status_id INT,
@@ -32,7 +32,7 @@
 	)
 	BEGIN
         
-        SELECT "order".*,os.name as order_status FROM "order" AS "order" 
+        SELECT "order".*,os.name as order_status,ops.name as payment_status,oss.name as shipping_status FROM "order" AS "order"
 		
 			LEFT JOIN order_status AS os ON ("order".order_status_id = os.order_status_id AND os.language_id = :language_id) 
 			LEFT JOIN shipping_status AS oss ON ("order".shipping_status_id = oss.shipping_status_id AND oss.language_id = :language_id) 
@@ -55,7 +55,27 @@
 		@IF isset(:order_status_id)
 		THEN 
 			AND "order".order_status_id = :order_status_id
-		END @IF		
+		END @IF	
+
+		@IF isset(:shipping_status)
+		THEN 
+			AND oss.name = :shipping_status
+		END @IF					
+		
+		@IF isset(:shipping_status_id)
+		THEN 
+			AND "order".shipping_status_id = :shipping_status_id
+		END @IF					
+		
+		@IF isset(:payment_status)
+		THEN 
+			AND ops.name = :payment_status
+		END @IF					
+		
+		@IF isset(:payment_status_id)
+		THEN 
+			AND "order".payment_status_id = :payment_status_id
+		END @IF
 
 		@IF isset(:email) AND !empty(:email)
 		THEN 
diff --git a/admin/sql/sqlite/order.sql b/admin/sql/sqlite/order.sql
@@ -6,7 +6,7 @@
 		-- variables
 		IN  language_id INT,
 		IN  site_id INT,
-		IN 	user_id INT
+		IN  user_id INT
 		
 		IN order_status CHAR,
 		IN order_status_id INT,
@@ -32,7 +32,7 @@
 	)
 	BEGIN
         
-        SELECT `order`.*,os.name as order_status FROM `order` AS `order`
+        SELECT `order`.*,os.name as order_status,ops.name as payment_status,oss.name as shipping_status FROM `order` AS `order`
 		
 			LEFT JOIN order_status AS os ON (`order`.order_status_id = os.order_status_id AND os.language_id = :language_id) 
 			LEFT JOIN shipping_status AS oss ON (`order`.shipping_status_id = oss.shipping_status_id AND oss.language_id = :language_id) 
diff --git a/admin/template/order/order.tpl b/admin/template/order/order.tpl
@@ -62,6 +62,8 @@ if(is_array($logs)) foreach ($logs as $index => $log) {
 [data-v-order] [data-v-order-site_url]|href = $this->order['site_url']
 
 [data-v-order] .badge[data-v-order-order_status]|addClass = <?php echo $this->order['class'] ?? '';?>
+[data-v-order] .badge[data-v-order-payment_status]|addClass = <?php echo $this->order['payment_class'] ?? '';?>
+[data-v-order] .badge[data-v-order-shipping_status]|addClass = <?php echo $this->order['shipping_class'] ?? '';?>
 
 [data-v-order-print-url]|href = $this->printUrl
 [data-v-order-print-shipping-url]|href = $this->printShippingUrl
diff --git a/admin/template/order/orders.tpl b/admin/template/order/orders.tpl
@@ -15,6 +15,8 @@ if(isset($this->orders) && is_array($this->orders)) {
 	[data-v-orders] [data-v-order] input[data-v-*]|value = $order['@@__data-v-(*)__@@']
 	
 	[data-v-orders] [data-v-order] .badge[data-v-order_status]|addClass = <?php echo $order['class'];?>
+	[data-v-orders] [data-v-order] .badge[data-v-payment_status]|addClass = <?php echo $order['payment_class'];?>
+	[data-v-orders] [data-v-order] .badge[data-v-shipping_status]|addClass = <?php echo $order['shipping_class'];?>
 
 	[data-v-orders] [data-v-order]|after = <?php 
 	} 
diff --git a/system/functions.php b/system/functions.php
@@ -1626,17 +1626,52 @@ function nl2p($string) {
 
 function orderStatusBadgeClass($order_status_id = 1) {
 	$classes = [
-		1 => 'bg-primary-subtle text-body',
-		2 => 'bg-success-subtle text-body',
-		3 => 'bg-danger-subtle text-body',
-		4 => 'bg-success',
-		5 => 'bg-danger',
-		6 => 'bg-danger',
+		1 => 'bg-primary-subtle text-body', //pending
+		2 => 'bg-info-subtle text-body', //processing
+		3 => 'bg-primary', //processed
+		4 => 'bg-success', //complete
+		5 => 'bg-danger', //canceled
+		6 => 'bg-secondary', //archived
+		7 => 'bg-warning', //requires_action
 	];
 
 	return $classes[$order_status_id] ?? 'bg-warning text-dark';
 }
 
+function paymentStatusBadgeClass($payment_status_id = 1) {
+	$classes = [
+		1  => 'bg-warning-subtle text-body', //not_paid
+		2  => 'bg-success-subtle text-body', //awaiting
+		3  => 'bg-danger-subtle text-body', //captured
+		4  => 'bg-success', //paid
+		5  => 'bg-danger', //canceled
+		6  => 'bg-danger', //refunded
+		7  => 'bg-danger', //partially_refunded
+		8  => 'bg-danger', //chargeback
+		9  => 'bg-danger', //requires_action
+		10 => 'bg-danger', //fraud
+	];
+
+	return $classes[$payment_status_id] ?? 'bg-warning text-dark';
+}
+
+function shippingStatusBadgeClass($shipping_status_id = 1) {
+	$classes = [
+		1  => 'bg-warning-subtle text-body', //not_fulfilled
+		2  => 'bg-success-subtle text-body', //fulfilled
+		3  => 'bg-success-subtle text-body', //partially_fulfilled
+		4  => 'bg-success', //shipped
+		5  => 'bg-success-subtle text-body', //partially_shipped
+		6  => 'bg-danger-subtle text-body', //returned
+		7  => 'bg-danger-subtle text-body', //partially_returned
+		8  => 'bg-success', //delivered
+		9  => 'bg-danger', //canceled
+		10 => 'bg-warning', //requires_action
+	];
+
+	return $classes[$shipping_status_id] ?? 'bg-warning text-dark';
+}
+
 function commentStatusBadgeClass($status = 0) {
 	$classes = [
 		0 => 'bg-primary-subtle text-body', //pending

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@ if(isset($this->orders) && is_array($this->orders)) {`
`15`	`15`	`[data-v-orders] [data-v-order] input[data-v-]\|value = $order['@@__data-v-()__@@']`
`16`	`16`
`17`	`17`	`[data-v-orders] [data-v-order] .badge[data-v-order_status]\|addClass = <?php echo $order['class'];?>`
	`18`	`+ [data-v-orders] [data-v-order] .badge[data-v-payment_status]\|addClass = <?php echo $order['payment_class'];?>`
	`19`	`+ [data-v-orders] [data-v-order] .badge[data-v-shipping_status]\|addClass = <?php echo $order['shipping_class'];?>`
`18`	`20`
`19`	`21`	`[data-v-orders] [data-v-order]\|after = <?php`
`20`	`22`	`}`