biz9-logic 4.9.20 → 4.9.21

package/biz9_config

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

package/index.js

@@ -86,11 +86,11 @@ class Title {
 	static ORDER_TRANSACTION_ID="TR-";
 	static ORDER_PAYMENT_STATUS_OPEN="Open";
 	static ORDER_PAYMENT_STATUS_COMPLETE="Complete";
+	static ORDER_PAYMENT_PLAN_PENDING="Pending";
 	static ORDER_PAYMENT_PLAN_1="1 Payment";
 	static ORDER_PAYMENT_PLAN_2="2 Payments";
 	static ORDER_PAYMENT_PLAN_3="3 Payments";
 	static ORDER_PAYMENT_PLAN_4="4 Payments";
-	static ORDER_PAYMENT_PLAN_5="5 Payments";
 	static ORDER_PAYMENT_METHOD_STRIPE="Stripe";
 	static ORDER_PAYMENT_METHOD_CASH="Cash";
 	static ORDER_PAYMENT_METHOD_OTHER="Other";
@@ -450,7 +450,8 @@ class Page_Logic {
 	};
 }
 class Order_Logic {
-	static get_new = (cart) => {
+	static get_new = (cart,option) => {
+		option = option?option:{get_payment_plan:false,payment_plan:Title.ORDER_PAYMENT_PLAN_1,payment_plan_status:Title.ORDER_PAYMENT_STATUS_OPEN};
 		let order = DataItem.get_new(DataType.ORDER,0,{
 			order_number:Title.ORDER_NUMBER + Num.get_id(99999),
 			parent_data_type:cart.parent_data_type,
@@ -459,6 +460,10 @@ class Order_Logic {
 			grand_total:0,
 			order_item_list:[]
 		});
+		if(option.get_payment_plan){
+			order.payment_plan = option.payment_plan;
+			order.payment_status = option.payment_plan_status;
+		}
 		cart.cart_item_list.forEach(cart_item => {
 			let order_item = DataItem.get_new(DataType.ORDER_ITEM,0,{
 				order_number:order.order_number,
@@ -491,7 +496,6 @@ class Order_Logic {
 				order_number:order_number,
 				payment_method_type:payment_method_type,
 				payment_amount:payment_amount,
-				payment_amount:payment_amount,
 				transaction_id:Title.ORDER_TRANSACTION_ID + Num.get_id(99999)
 			});
 	};
@@ -516,15 +520,8 @@ class Order_Logic {
     };
 }
 class Cart_Logic {
-	static get_new = (parent_data_type,user_id,option) => {
-		option = option?option:{get_payment_plan:false,payment_plan:Title.ORDER_PAYMENT_PLAN_1,payment_plan_status:Title.ORDER_PAYMENT_STATUS_OPEN};
-		Log.w('rrrrr',option);
-		let order = DataItem.get_new(DataType.CART,0,{user_id:user_id,cart_number:Title.CART_NUMBER + Num.get_id(99999),parent_data_type:parent_data_type,grand_total:0,cart_item_list:[]});
-		if(option.get_payment_plan){
-			order.payment_plan = option.payment_plan;
-			order.payment_status = option.payment_plan_status;
-		}
-		return order;
+	static get_new = (parent_data_type,user_id) => {
+		return DataItem.get_new(DataType.CART,0,{user_id:user_id,cart_number:Title.CART_NUMBER + Num.get_id(99999),parent_data_type:parent_data_type,grand_total:0,cart_item_list:[]});
 	};
 	static get_new_cart_item = (parent_data_type,parent_id,cart_number,quanity,cost) =>{
 		return DataItem.get_new(DataType.CART_ITEM,0,{parent_data_type:parent_data_type,parent_id:parent_id,cart_number:cart_number,quanity:quanity?quanity:0,cost:cost?cost:0,cart_sub_item_list:[]});

package/package.json

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

package/test.js

@@ -1,5 +1,5 @@
 const series = require('async-series');
-const {DataItem,DataType,Page_Logic,Product_Logic,Type,Title,Stat_Logic,Service_Logic,Blog_Post_Logic,Event_Logic,Demo_Logic,Cart_Logic} = require('./index');
+const {DataItem,DataType,Page_Logic,Product_Logic,Type,Title,Stat_Logic,Service_Logic,Blog_Post_Logic,Event_Logic,Demo_Logic,Cart_Logic,Order_Logic} = require('./index');
 const {Log,Num,Str} = require('biz9-utility');
 const {Scriptz}= require('biz9-scriptz');
 
@@ -32,21 +32,20 @@ describe("connect", () => {
             function(call) {
                 console.log('CONNECT-START');
 
-                let post_cart = Cart_Logic.get_new(DataType.PRODUCT,0,{get_payment_plan:true,payment_plan:Title.ORDER_PAYMENT_PLAN_1,payment_plan_status:Title.ORDER_PAYMENT_STATUS_OPEN});
-                /*
-                let post_cart_list = [];
-                let post_cart_item = Cart_Logic.get_new_cart_item(DataType.PRODUCT,123,post_cart.cart_number,1,30);
-                let post_cart_sub_item = Cart_Logic.get_new_cart_sub_item(DataType.PRODUCT,1234,post_cart.cart_number,1,10);
-                let post_cart_sub_item_2 = Cart_Logic.get_new_cart_sub_item(DataType.PRODUCT,1234,post_cart.cart_number,1,30);
-                post_cart_item.cart_sub_item_list.push(post_cart_sub_item);
-                post_cart_item.cart_sub_item_list.push(post_cart_sub_item_2);
-                post_cart.cart_item_list.push(post_cart_item);
-                */
-
-                Log.w('post_cart',post_cart);
+                //let post_cart = Cart_Logic.get_new(DataType.PRODUCT,0,);
+                let post_cart = Cart_Logic.get_new(DataType.PRODUCT,0);
+                //let post_cart_list = [];
+                //let post_cart_item = Cart_Logic.get_new_cart_item(DataType.PRODUCT,123,post_cart.cart_number,1,30);
+                //let post_cart_sub_item = Cart_Logic.get_new_cart_sub_item(DataType.PRODUCT,1234,post_cart.cart_number,1,10);
+                //let post_cart_sub_item_2 = Cart_Logic.get_new_cart_sub_item(DataType.PRODUCT,1234,post_cart.cart_number,1,30);
+                //post_cart_item.cart_sub_item_list.push(post_cart_sub_item);
+                //post_cart_item.cart_sub_item_list.push(post_cart_sub_item_2);
+                //post_cart.cart_item_list.push(post_cart_item);
+
+                //Log.w('post_cart',post_cart);
+                Log.w('post_order',Order_Logic.get_new(post_cart,{get_payment_plan:true,payment_plan:Title.ORDER_PAYMENT_PLAN_1,payment_plan_status:Title.ORDER_PAYMENT_STATUS_OPEN}));
                 //Log.w('post_cart_2',Cart_Logic.get_total(post_cart));
 
-
                 console.log('CONNECT-END');
                 //call();
             },