biz9-logic 4.9.11 → 4.9.13

package/biz9_config

@@ -1,4 +1,4 @@
-VERSION='8.8.1'
+VERSION='8.8.3'
 TITLE='BiZ9-Logic';
 REPO='git@github.com:biz9framework/biz9-logic.git';
 BRANCH='main';

package/index.js

@@ -456,7 +456,7 @@ class Order_Logic {
 			parent_data_type:cart.parent_data_type,
 			user_id:cart.user_id,
 			cart_number:cart.cart_number,
-			grand_total:cart.grand_total,
+			grand_total:0,
 			order_item_list:[]
 		});
 		cart.cart_item_list.forEach(cart_item => {
@@ -481,9 +481,8 @@ class Order_Logic {
 				order_item.order_sub_item_list.push(order_sub_item);
 			});
 			order.order_item_list.push(order_item);
-
 		});
-		order = Order_Logic.caculate_total(order);
+		order = Order_Logic.get_total(order);
 		return order;
 	};
 	static get_new_order_payment = (order_number,payment_method_type,payment_amount) => {
@@ -495,22 +494,23 @@ class Order_Logic {
 				transaction_id:Order_Logic.TRANSACTION_ID + Num.get_id(99999)
 			});
 	};
-	 static caculate_total = (order) => {
+	 static get_total = (order) => {
         let grand_total = 0;
         order.order_item_list.forEach(order_item => {
             order_item.sub_total = 0;
             if(!isNaN(order_item.cost)){
                 order_item.sub_total = (order_item.sub_total + order_item.cost) * order_item.quanity;
-                order.grand_total = order.grand_total + order_item.sub_total;
+                grand_total = grand_total + order_item.sub_total;
             }
             order_item.order_sub_item_list.forEach(order_sub_item => {
                 order_sub_item.sub_total = 0;
                 if(!isNaN(order_sub_item.cost)){
                     order_sub_item.sub_total = (order_sub_item.sub_total + order_sub_item.cost) * order_sub_item.quanity;
-                    order.grand_total = order.grand_total + order_sub_item.sub_total;
+                    grand_total = grand_total + order_sub_item.sub_total;
                 }
             });
         });
+		 order.grand_total = grand_total;
         return order;
     };
 }
@@ -524,7 +524,7 @@ class Cart_Logic {
 	static get_new_cart_sub_item = (parent_data_type,parent_id,cart_number,quanity,cost) =>{
 		return DataItem.get_new(DataType.CART_SUB_ITEM,0,{parent_data_type:parent_data_type,parent_id:parent_id,cart_number:cart_number,quanity:quanity,cost:cost?cost:0});
 	};
-    static get_grand_total = (cart) => {
+    static get_total = (cart) => {
         let grand_total = 0;
         cart.cart_item_list.forEach(cart_item => {
             cart_item.sub_total = 0;
@@ -540,7 +540,8 @@ class Cart_Logic {
                 }
             });
         });
-        return grand_total;
+		cart.grand_total = grand_total;
+        return cart;
     };
 }
 class Product_Logic {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "biz9-logic",
-  "version": "4.9.11",
+  "version": "4.9.13",
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"