biz9-logic 4.9.73 → 4.9.77

package/biz9_config

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

package/index.js

@@ -10,7 +10,6 @@ const { Log,Str,DateTime,Num,Obj } = require('/home/think2/www/doqbox/biz9-frame
 class Message {
 	static SUCCESS="Success";
 	static CONFIRM="Are You Sure?";
-
 	static USER_LOGIN_SUCCESS="Login Success";
 	static USER_LOGIN_BAD="Login Incorrect";
 	static USER_REGISTER_SUCCESS="Register Success";
@@ -23,14 +22,11 @@ class Message {
 	static USER_USERNAME_BAD="Please Enter A Valid Username.";
 	static USER_USERNAME_NOT_UNIQUE="Username Not Availble. Please Choose Another.";
 	static ITEM_TITLE_BAD="Please Enter A Valid Title.";
-
 	static DATA_NOT_FOUND="Data Not Found.";
 	static SYSTEM_NOT_FOUND="System Not Found.";
-
 	static FAVORITE_ADD_SUCCESS="Favorite Add Success.";
 	static FAVORITE_REMOVE_SUCCESS="Favorite Remove Success.";
 	static FAVORITE_USER_LOGIN="Please Login To Add Favorite.";
-
 	static REVIEW_ADD_SUCCESS="Review Add Success.";
 	static REVIEW_REMOVE_SUCCESS="Review Remove Success.";
 	static REVIEW_USER_LOGIN="Please Login To Add Review.";
@@ -91,9 +87,16 @@ class Title {
 	//order
 	static ORDER_NUMBER="OR-";
 	static ORDER_TRANSACTION_ID="TR-";
-	static ORDER_PAYMENT_STATUS_OPEN="Open";
+	static ORDER_STATUS_CANCELLED="Cancelled";
+	static ORDER_STATUS_COMPLETE="Complete";
+	static ORDER_STATUS_NEW="New";
+	static ORDER_STATUS_OPEN="Open";
+	static ORDER_STATUS_ON_HOLD="On Hold";
+	static ORDER_STATUS_RETURNED="Returned";
 	static ORDER_PAYMENT_STATUS_COMPLETE="Complete";
-	static ORDER_PAYMENT_PLAN_PENDING="Pending";
+	static ORDER_PAYMENT_STATUS_NEW="New";
+	static ORDER_PAYMENT_STATUS_OPEN="Open";
+	static ORDER_PAYMENT_PLAN_NEW="New";
 	static ORDER_PAYMENT_PLAN_1="1 Payment";
 	static ORDER_PAYMENT_PLAN_2="2 Payments";
 	static ORDER_PAYMENT_PLAN_3="3 Payments";
@@ -132,9 +135,7 @@ class Title {
 class Demo_Logic {
 	static get_new_type = (title,option) => {
 		title = !Str.check_is_null(title)?title:Title.TYPE+" " +Num.get_id(999);
-		option = option ? option : {get_category:false,category_count:6,categorys:'',category_data_type:DataType.BLANK,get_item:false,items:'',item_data_type:DataType.BLANK,item_count:6};
-		const item = Item_Logic.get_new(title,DataType.TYPE);
-		//category
+		option = option ? option : {get_category:false,category_count:6,categorys:'',category_data_type:DataType.BLANK,get_item:false,items:'',item_data_type:DataType.BLANK,item_count:6}; const item = Item_Logic.get_new(title,DataType.TYPE); //category
 		if(option.get_category){
 			item.categorys = [];
 			let category_title_list = [];
@@ -295,7 +296,23 @@ class Type {
 	static IMAGE_RESIZE_NORMAL="normal";
 	static IMAGE_RESIZE_SQUARE="squre";
 	static IMAGE_RESIZE_NONE="none";
-	//
+	//order
+	static ORDER_STATUS_NEW="new";
+	static ORDER_STATUS_OPEN="open";
+	static ORDER_STATUS_COMPLETE="complete";
+	static ORDER_STATUS_RETURNED="returned";
+	static ORDER_STATUS_ON_HOLD="on_hold";
+	static ORDER_STATUS_CANCELLED="cancelled";
+	static get_order_status_list(){
+		return [
+			{value:Type.ORDER_STATUS_NEW,label:Title.ORDER_STATUS_NEW},
+			{value:Type.ORDER_STATUS_OPEN,label:Title.ORDER_STATUS_OPEN},
+			{value:Type.ORDER_STATUS_COMPLETE,label:Title.ORDER_STATUS_COMPLETE},
+			{value:Type.ORDER_STATUS_RETURNED,label:Title.ORDER_STATUS_RETURNED},
+			{value:Type.ORDER_STATUS_ON_HOLD,label:Title.ORDER_STATUS_ON_HOLD},
+			{value:Type.ORDER_STATUS_CANCELLED,label:Title.ORDER_STATUS_CANCELLED},
+		];
+	};
 	static get_user_role_list(){
 		return [
 			{value:Type.USER_ROLE_SUPER_ADMIN,label:Title.USER_ROLE_SUPER_ADMIN},
@@ -305,7 +322,6 @@ class Type {
 			{value:Type.USER_ROLE_GUEST,label:Title.USER_ROLE_GUEST},
 		];
 	};
-	//
 	static get_stat_type_list = () =>{
 		return [
 			{title:Type.get_title(Type.STAT_CART),type:Type.STAT_CART,label:Type.get_title(Type.STAT_CART),value:Type.STAT_CART},
@@ -460,9 +476,16 @@ class Type {
 			case Type.USER_ROLE_MANAGER:
 			case Type.USER_ROLE_USER:
 			case Type.USER_ROLE_GUEST:
-			case Type.ORDER_PAYMENT_STATUS_OPEN:
+			case Type.ORDER_STATUS_NEW:
+			case Type.ORDER_STATUS_OPEN:
+			case Type.ORDER_STATUS_COMPLETE:
+			case Type.ORDER_STATUS_RETURNED:
+			case Type.ORDER_STATUS_ON_HOLD:
+			case Type.ORDER_STATUS_CANCELLED:
 			case Type.ORDER_PAYMENT_STATUS_COMPLETE:
-			case Type.ORDER_PAYMENT_PLAN_PENDING:
+			case Type.ORDER_PAYMENT_STATUS_NEW:
+			case Type.ORDER_PAYMENT_STATUS_OPEN:
+			case Type.ORDER_PAYMENT_PLAN_NEW:
 			case Type.ORDER_PAYMENT_PLAN_1:
 			case Type.ORDER_PAYMENT_PLAN_2:
 			case Type.ORDER_PAYMENT_PLAN_3:
@@ -607,7 +630,7 @@ class Page_Logic {
 }
 class Order_Logic {
 	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};
+		option = option?option:{get_payment_plan:false,payment_plan:Title.ORDER_PAYMENT_PLAN_1,payment_plan_status:Title.ORDER_PAYMENT_STATUS_PENDING};
 		let order = DataItem.get_new(DataType.ORDER,0,{
 			order_number:Title.ORDER_NUMBER + Num.get_id(99999),
 			parent_data_type:cart.parent_data_type,

package/package.json

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

package/test.js

@@ -38,16 +38,8 @@ describe("connect", () => {
        let parent_id = 3334;
        let user_id = 0;
        let item_list = [];
-       for(let a = 0; a < 3;a++){
-            let item = Product_Logic.get_test();
-            let parent_item = Product_Logic.get_test();
-            let user = User_Logic.get_test();
-           item.parent_item = parent_item;
-           item.user = user;
-           item_list.push(item);
-       }
-       //Log.w('aaaaa',Type.get_app_link_list());
-       Log.w('Link Title',Type.get_title(DataType.LINK));
+       Log.w('Title',Type.get_title(Type.ORDER_STATUS_NEW));
+       Log.w('Title 2',Type.get_title(Type.ORDER_STATUS_COMPLETE));
        //Log.w('item_list',item_list);
        //Log.w('bind_obj_list',App_Logic.bind_item_parent_user_list(item_list));