Powerful and easy to use cms to build websites, blogs or ecommerce stores.
HTML backendblogblog-engineblog-platformbloggingcmscontent-managementcontent-management-systemecommerceecommerce-platformno-codepage-builderphpphp-cmsphp7php8self-hostedshopping-cartweb-applicationwebsite-builder
Sort order default value and fix for option group add
givanzcfc64b03b79a
diff --git a/admin/controller/crud.php b/admin/controller/crud.phpindex b1d51d8..60564cb 100755--- a/admin/controller/crud.php+++ b/admin/controller/crud.php@@ -32,6 +32,8 @@ class Crud extends Base {protected $module = '';protected $type = '';++ protected $redirect = true;function save() {$type = $this->type;@@ -49,22 +51,25 @@ class Crud extends Base {if (! $data_id) {$data['created_at'] = $data['created_at'] ?? date('Y-m-d H:i:s');}- $data['updated_at'] = $data['updated_at'] ?? date('Y-m-d H:i:s');- $options = [$type => $data] + $this->global;-+ $data['updated_at'] = $data['updated_at'] ?? date('Y-m-d H:i:s');+ $options = [$type => $data] + $this->global;+if ($data_id) {- $options[$type_id] = $data_id;- $result = $model->edit($options);+ $options[$type_id] = $data_id;+ $this->$type_id = $data_id;+ $result = $model->edit($options);} else {- $result = $model->add($options);+ $result = $model->add($options);+ $this->$type_id = $result[$type] ?? false;}if ($result && isset($result[$type])) {$successMessage = humanReadable(__($type)) . __(' saved!');$this->view->success[] = $successMessage;- if (! $data_id) {- $this->session->set('success', $successMessage);+ $this->session->set('success', $successMessage);++ if (! $data_id && $this->redirect) {$this->redirect(['module' => "$module/$controller", $type_id => $result[$type]]);}} else {@@ -72,7 +77,9 @@ class Crud extends Base {}}- return $this->index();+ if ($this->redirect) {+ return $this->index();+ }}function index() {diff --git a/admin/controller/product/option.php b/admin/controller/product/option.phpindex 28cf7e1..08846ad 100755--- a/admin/controller/product/option.php+++ b/admin/controller/product/option.php@@ -31,15 +31,19 @@ use Vvveb\System\Images;class Option extends Crud {protected $type = 'option';- protected $controller = 'option_value';+ protected $controller = 'option';protected $module = 'product';function save() {- $delete = $this->request->post['delete']['option_value_id'] ?? [];+ $this->redirect = false;+ parent::save();++ $delete = $this->request->post['delete']['option_value_id'] ?? [];$option_value = $this->request->post['option_value'] ?? [];$option = $this->request->post['option'] ?? [];- $option_id = $this->request->get['option_id'] ?? false;+ $edit = $this->request->get['option_id'] ?? false;+ $option_id = $this->option_id;$new = [];foreach ($option_value as $index => &$attr) {@@ -76,15 +80,15 @@ class Option extends Crud {$result = $optionSql->edit(['option_id' => $option_id, 'option' => $option]);if ($result && isset($result['option_content'])) {- //$successMessage = __('Saved!');- //$this->view->success[] = $successMessage;- //$this->view->errors = [];+ if (!$edit) {+ $this->redirect(['module' => "{$this->module}/{$this->controller}", 'option_id' => $option_id]);+ }} else {$this->view->errors[] = __('Error saving!');}}- parent::save();+ return $this->index();}function index() {@@ -121,4 +125,4 @@ class Option extends Crud {$this->view->option_values = $option_values;$this->view->option_id = $option_id;}-}\ No newline at end of file+}diff --git a/install/sql/insert/menu/menu_item.sql b/install/sql/insert/menu/menu_item.sqlindex 4764e83..49aca0d 100755--- a/install/sql/insert/menu/menu_item.sql+++ b/install/sql/insert/menu/menu_item.sql@@ -56,11 +56,11 @@ INSERT INTO `menu_item` (`menu_item_id`, `menu_id`, `type`, `url`, `parent_id`,-- (61,1,'link','/page/contact',59,null,3,1),-- (62,1,'link','/page/contact',59,null,2,1),-(63,1,'link','/page/contact',0,null,4,1),+(63,1,'link','/page/services',0,null,4,1),(64,1,'link','/page/pricing',63,null,0,1),(65,1,'link','/page/services',63,null,0,1),(66,1,'link','/page/portfolio',63,null,0,1),-(67,1,'text','/page/about',0,NULL,3, 0),+(67,1,'text','/page/portfolio',0,NULL,3, 0),(68,1,'text','/page/about',67,NULL,0,0),-- footer(50,5,'link','',0,null,0,1),diff --git a/install/sql/insert/menu/menu_item_content.sql b/install/sql/insert/menu/menu_item_content.sqlindex 10dc2fc..7a402ea 100755--- a/install/sql/insert/menu/menu_item_content.sql+++ b/install/sql/insert/menu/menu_item_content.sql@@ -111,7 +111,7 @@ INSERT INTO `menu_item_content` VALUES(64,1, 'Pricing', 'Pricing', ''),(65,1, 'Services', 'Services', ''),(66,1, 'Portfolio', 'Portfolio', ''),-(67,1, 'Mega menu', '', '<p><img src="/media/vvveb.svg" height="24" alt="" class="me-2">Mega menu</p>'),+(67,1, 'Mega menu', '', '<img src="/media/vvveb.svg" height="24" alt="" class="me-2">Mega menu'),(68,1, 'Features', '', '<div class="row"><div class="col-6 align-self-center"><img src="../../media/posts/4.jpg" alt="Post" width="250" loading="lazy" class="rounded img-fluid"></div><div class="col-6">diff --git a/install/sql/mysqli/schema/attribute/attribute.sql b/install/sql/mysqli/schema/attribute/attribute.sqlindex 7816541..7de9de1 100755--- a/install/sql/mysqli/schema/attribute/attribute.sql+++ b/install/sql/mysqli/schema/attribute/attribute.sql@@ -3,6 +3,6 @@ DROP TABLE IF EXISTS `attribute`;CREATE TABLE `attribute` (`attribute_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,`attribute_group_id` int(10) UNSIGNED NOT NULL,- `sort_order` int(3) NOT NULL,+ `sort_order` int(3) NOT NULL DEFAULT 0,PRIMARY KEY (`attribute_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;diff --git a/install/sql/mysqli/schema/attribute/attribute_group.sql b/install/sql/mysqli/schema/attribute/attribute_group.sqlindex 799ab35..bb3b1f6 100755--- a/install/sql/mysqli/schema/attribute/attribute_group.sql+++ b/install/sql/mysqli/schema/attribute/attribute_group.sql@@ -2,6 +2,6 @@ DROP TABLE IF EXISTS `attribute_group`;CREATE TABLE `attribute_group` (`attribute_group_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,- `sort_order` int(3) NOT NULL,+ `sort_order` int(3) NOT NULL DEFAULT 0,PRIMARY KEY (`attribute_group_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;diff --git a/install/sql/mysqli/schema/fields/field.sql b/install/sql/mysqli/schema/fields/field.sqlindex be423b1..519fba7 100755--- a/install/sql/mysqli/schema/fields/field.sql+++ b/install/sql/mysqli/schema/fields/field.sql@@ -5,7 +5,7 @@ CREATE TABLE `field` (`field_group_id` int NOT NULL,`type` varchar(32) NOT NULL,`value` text NOT NULL,- `status` tinyint NOT NULL,- `sort_order` int NOT NULL,+ `status` tinyint NOT NULL DEFAULT 0,+ `sort_order` int NOT NULL DEFAULT 0,PRIMARY KEY (`field_id`)) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;diff --git a/install/sql/mysqli/schema/fields/field_value.sql b/install/sql/mysqli/schema/fields/field_value.sqlindex 1032f87..07607ab 100755--- a/install/sql/mysqli/schema/fields/field_value.sql+++ b/install/sql/mysqli/schema/fields/field_value.sql@@ -3,6 +3,6 @@ DROP TABLE IF EXISTS `field_value`;CREATE TABLE `field_value` (`field_value_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,`field_id` int(10) UNSIGNED NOT NULL,- `sort_order` int(3) NOT NULL,+ `sort_order` int(3) NOT NULL DEFAULT 0,PRIMARY KEY (`field_value_id`)) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;diff --git a/install/sql/mysqli/schema/option/option.sql b/install/sql/mysqli/schema/option/option.sqlindex 1cce14b..f0bfd91 100755--- a/install/sql/mysqli/schema/option/option.sql+++ b/install/sql/mysqli/schema/option/option.sql@@ -3,6 +3,6 @@ DROP TABLE IF EXISTS `option`;CREATE TABLE `option` (`option_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,`type` varchar(64) NOT NULL,- `sort_order` int(3) NOT NULL,+ `sort_order` int(3) NOT NULL DEFAULT 0,PRIMARY KEY (`option_id`, `type`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;diff --git a/install/sql/mysqli/schema/option/option_value.sql b/install/sql/mysqli/schema/option/option_value.sqlindex 9aaf770..b74dc30 100755--- a/install/sql/mysqli/schema/option/option_value.sql+++ b/install/sql/mysqli/schema/option/option_value.sql@@ -4,6 +4,6 @@ CREATE TABLE `option_value` (`option_value_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT,`option_id` int(10) UNSIGNED NOT NULL,`image` varchar(255) NOT NULL,- `sort_order` int(3) NOT NULL,+ `sort_order` int(3) NOT NULL DEFAULT 0,PRIMARY KEY (`option_value_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;diff --git a/install/sql/mysqli/schema/order/order_product_option.sql b/install/sql/mysqli/schema/order/order_product_option.sqlindex b525811..0f9ef86 100755--- a/install/sql/mysqli/schema/order/order_product_option.sql+++ b/install/sql/mysqli/schema/order/order_product_option.sql@@ -6,8 +6,9 @@ CREATE TABLE `order_product_option` (`order_product_id` INT UNSIGNED NOT NULL,`product_option_id` INT UNSIGNED NOT NULL,`product_option_value_id` INT UNSIGNED NOT NULL DEFAULT '0',+ `option` varchar(191) NOT NULL,`name` varchar(191) NOT NULL,- `value` text NOT NULL,- `type` varchar(32) NOT NULL,+ `price` decimal(15,4) NOT NULL DEFAULT '0.0000',+ `type` varchar(32) NOT NULL DEFAULT '',PRIMARY KEY (`order_product_option_id`)) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;\ No newline at end of filediff --git a/install/sql/mysqli/schema/subscription/subscription_plan.sql b/install/sql/mysqli/schema/subscription/subscription_plan.sqlindex 7686c91..b8125b8 100644--- a/install/sql/mysqli/schema/subscription/subscription_plan.sql+++ b/install/sql/mysqli/schema/subscription/subscription_plan.sql@@ -10,6 +10,6 @@ CREATE TABLE `subscription_plan` (`trial_cycle` int(10) UNSIGNED NOT NULL,`trial_status` tinyint(4) NOT NULL,`status` tinyint NOT NULL,- `sort_order` int(3) NOT NULL,+ `sort_order` int(3) NOT NULL DEFAULT 0,PRIMARY KEY (`subscription_plan_id`)) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;diff --git a/install/sql/pgsql/schema/attribute/attribute.sql b/install/sql/pgsql/schema/attribute/attribute.sqlindex 67c2e25..1144f63 100755--- a/install/sql/pgsql/schema/attribute/attribute.sql+++ b/install/sql/pgsql/schema/attribute/attribute.sql@@ -7,6 +7,6 @@ SELECT setval('attribute_seq', 12, true); -- last inserted id by sample dataCREATE TABLE "attribute" ("attribute_id" int check ("attribute_id" > 0) NOT NULL DEFAULT NEXTVAL ('attribute_seq'),"attribute_group_id" int check ("attribute_group_id" > 0) NOT NULL DEFAULT 0,- "sort_order" INT NOT NULL,+ "sort_order" INT NOT NULL DEFAULT 0,PRIMARY KEY ("attribute_id"));diff --git a/install/sql/pgsql/schema/attribute/attribute_group.sql b/install/sql/pgsql/schema/attribute/attribute_group.sqlindex 3e7e4b5..e253aef 100755--- a/install/sql/pgsql/schema/attribute/attribute_group.sql+++ b/install/sql/pgsql/schema/attribute/attribute_group.sql@@ -6,6 +6,6 @@ SELECT setval('attribute_group_seq', 4, true); -- last inserted id by sample datCREATE TABLE "attribute_group" ("attribute_group_id" int check ("attribute_group_id" > 0) NOT NULL DEFAULT NEXTVAL ('attribute_group_seq'),- "sort_order" INT NOT NULL,+ "sort_order" INT NOT NULL DEFAULT 0,PRIMARY KEY ("attribute_group_id"));diff --git a/install/sql/pgsql/schema/fields/field.sql b/install/sql/pgsql/schema/fields/field.sqlindex 85a35a0..fed8360 100755--- a/install/sql/pgsql/schema/fields/field.sql+++ b/install/sql/pgsql/schema/fields/field.sql@@ -11,6 +11,6 @@ CREATE TABLE field ("type" varchar(32) NOT NULL,"value" text NOT NULL,"status" smallint NOT NULL,- "sort_order" int NOT NULL,+ "sort_order" int NOT NULL DEFAULT 0,PRIMARY KEY ("field_id"));diff --git a/install/sql/pgsql/schema/fields/field_value.sql b/install/sql/pgsql/schema/fields/field_value.sqlindex 988f4b4..04b1d87 100755--- a/install/sql/pgsql/schema/fields/field_value.sql+++ b/install/sql/pgsql/schema/fields/field_value.sql@@ -8,6 +8,6 @@ CREATE SEQUENCE field_value_seq;CREATE TABLE field_value ("field_value_id" int NOT NULL DEFAULT NEXTVAL ('field_value_seq'),"field_id" int NOT NULL,- "sort_order" int NOT NULL,+ "sort_order" int NOT NULL DEFAULT 0,PRIMARY KEY ("field_value_id"));diff --git a/install/sql/pgsql/schema/option/option.sql b/install/sql/pgsql/schema/option/option.sqlindex 4af903d..430da59 100755--- a/install/sql/pgsql/schema/option/option.sql+++ b/install/sql/pgsql/schema/option/option.sql@@ -7,6 +7,6 @@ SELECT setval('option_seq', 14, true); -- last inserted id by sample dataCREATE TABLE "option" ("option_id" int check ("option_id" > 0) NOT NULL DEFAULT NEXTVAL ('option_seq'),"type" TEXT NOT NULL,- "sort_order" INT NOT NULL,+ "sort_order" INT NOT NULL DEFAULT 0,PRIMARY KEY ("option_id", "type"));diff --git a/install/sql/pgsql/schema/option/option_value.sql b/install/sql/pgsql/schema/option/option_value.sqlindex 6a2b1f6..c5297f1 100755--- a/install/sql/pgsql/schema/option/option_value.sql+++ b/install/sql/pgsql/schema/option/option_value.sql@@ -8,6 +8,6 @@ CREATE TABLE "option_value" ("option_value_id" int check ("option_value_id" > 0) NOT NULL DEFAULT NEXTVAL ('option_value_seq'),"option_id" INT NOT NULL,"image" TEXT NOT NULL,- "sort_order" INT NOT NULL,+ "sort_order" INT NOT NULL DEFAULT 0,PRIMARY KEY ("option_value_id"));diff --git a/install/sql/pgsql/schema/order/order.sql b/install/sql/pgsql/schema/order/order.sqlindex b058703..518b882 100755--- a/install/sql/pgsql/schema/order/order.sql+++ b/install/sql/pgsql/schema/order/order.sql@@ -13,7 +13,7 @@ CREATE TABLE "order" ("site_name" varchar(64) NOT NULL,"site_url" varchar(191) NOT NULL,"user_id" int NOT NULL DEFAULT 0,- "user_group_id" int check ("user_group_id" > 0) NOT NULL DEFAULT 0,+ "user_group_id" int check ("user_group_id" > 0) NOT NULL DEFAULT 1,"first_name" varchar(32) NOT NULL,"last_name" varchar(32) NOT NULL,"email" varchar(96) NOT NULL,@@ -47,7 +47,7 @@ CREATE TABLE "order" ("shipping_method" varchar(128) NOT NULL DEFAULT '',"shipping_data" text NOT NULL DEFAULT '',"total" decimal(15,4) NOT NULL DEFAULT 0.0000,- "order_status_id" int check ("order_status_id" > 0) NOT NULL DEFAULT 0,+ "order_status_id" int check ("order_status_id" > 0) NOT NULL DEFAULT 1,"language_id" int check ("language_id" > 0) NOT NULL,"currency_id" int check ("currency_id" > 0) NOT NULL,"currency_code" varchar(3) NOT NULL DEFAULT '',diff --git a/install/sql/pgsql/schema/order/order_product_option.sql b/install/sql/pgsql/schema/order/order_product_option.sqlindex b9d79f6..30ed0a0 100755--- a/install/sql/pgsql/schema/order/order_product_option.sql+++ b/install/sql/pgsql/schema/order/order_product_option.sql@@ -11,8 +11,9 @@ CREATE TABLE order_product_option ("order_product_id" int check ("order_product_id" > 0) NOT NULL,"product_option_id" int check ("product_option_id" > 0) NOT NULL,"product_option_value_id" int check ("product_option_value_id" > 0) NOT NULL DEFAULT 0,+ "option" varchar(191) NOT NULL,"name" varchar(191) NOT NULL,- "value" text NOT NULL,- "type" varchar(32) NOT NULL,+ "price" decimal(15,4) NOT NULL DEFAULT 0.0000,+ "type" varchar(32) NOT NULL DEFAULT '',PRIMARY KEY ("order_product_option_id"));diff --git a/install/sql/pgsql/schema/subscription/subscription_plan.sql b/install/sql/pgsql/schema/subscription/subscription_plan.sqlindex 8d86e65..46c0db5 100644--- a/install/sql/pgsql/schema/subscription/subscription_plan.sql+++ b/install/sql/pgsql/schema/subscription/subscription_plan.sql@@ -14,7 +14,7 @@ CREATE TABLE "subscription_plan" ("trial_length" INT NOT NULL,"trial_cycle" INT NOT NULL,"trial_status" smallint NOT NULL,- "status" smallint NOT NULL,- "sort_order" INT NOT NULL,+ "status" smallint NOT NULL DEFAULT 0,+ "sort_order" INT NOT NULL DEFAULT 0,PRIMARY KEY ("subscription_plan_id"));diff --git a/install/sql/sqlite/schema/attribute/attribute.sql b/install/sql/sqlite/schema/attribute/attribute.sqlindex 7cc9720..5230755 100755--- a/install/sql/sqlite/schema/attribute/attribute.sql+++ b/install/sql/sqlite/schema/attribute/attribute.sql@@ -3,6 +3,6 @@ DROP TABLE IF EXISTS `attribute`;CREATE TABLE `attribute` (`attribute_id` INTEGER PRIMARY KEY AUTOINCREMENT,`attribute_group_id` INT NOT NULL,- `sort_order` INT NOT NULL+ `sort_order` INT NOT NULL DEFAULT 0-- PRIMARY KEY (`attribute_id`));diff --git a/install/sql/sqlite/schema/attribute/attribute_group.sql b/install/sql/sqlite/schema/attribute/attribute_group.sqlindex d593d43..4ebada7 100755--- a/install/sql/sqlite/schema/attribute/attribute_group.sql+++ b/install/sql/sqlite/schema/attribute/attribute_group.sql@@ -2,6 +2,6 @@ DROP TABLE IF EXISTS `attribute_group`;CREATE TABLE `attribute_group` (`attribute_group_id` INTEGER PRIMARY KEY AUTOINCREMENT,- `sort_order` INT NOT NULL+ `sort_order` INT NOT NULL DEFAULT 0-- PRIMARY KEY (`attribute_group_id`));diff --git a/install/sql/sqlite/schema/fields/field_value.sql b/install/sql/sqlite/schema/fields/field_value.sqlindex 95a7c4f..a32b82c 100755--- a/install/sql/sqlite/schema/fields/field_value.sql+++ b/install/sql/sqlite/schema/fields/field_value.sql@@ -4,7 +4,7 @@ CREATE TABLE `field_value` (`field_id` INTEGER NOT NULL,`language_id` INT NOT NULL,`value` TEXT NOT NULL,-`sort_order` INTEGER NOT NULL+`sort_order` INTEGER NOT NULL DEFAULT 0-- PRIMARY KEY (`field_value_id`));diff --git a/install/sql/sqlite/schema/option/option.sql b/install/sql/sqlite/schema/option/option.sqlindex 7e21da9..1e34a54 100755--- a/install/sql/sqlite/schema/option/option.sql+++ b/install/sql/sqlite/schema/option/option.sql@@ -3,6 +3,6 @@ DROP TABLE IF EXISTS `option`;CREATE TABLE `option` (`option_id` INTEGER PRIMARY KEY AUTOINCREMENT,`type` TEXT NOT NULL,- `sort_order` INT NOT NULL+ `sort_order` INT NOT NULL DEFAULT 0-- PRIMARY KEY (`option_id`, `type`));diff --git a/install/sql/sqlite/schema/option/option_value.sql b/install/sql/sqlite/schema/option/option_value.sqlindex d36acf3..7845303 100755--- a/install/sql/sqlite/schema/option/option_value.sql+++ b/install/sql/sqlite/schema/option/option_value.sql@@ -4,6 +4,6 @@ CREATE TABLE `option_value` (`option_value_id` INTEGER PRIMARY KEY AUTOINCREMENT,`option_id` INT NOT NULL,`image` TEXT NOT NULL,- `sort_order` INT NOT NULL+ `sort_order` INT NOT NULL DEFAULT 0-- PRIMARY KEY (`option_value_id`));\ No newline at end of filediff --git a/install/sql/sqlite/schema/order/order_product_option.sql b/install/sql/sqlite/schema/order/order_product_option.sqlindex d9c3346..48555e1 100755--- a/install/sql/sqlite/schema/order/order_product_option.sql+++ b/install/sql/sqlite/schema/order/order_product_option.sql@@ -6,8 +6,9 @@ CREATE TABLE `order_product_option` (`order_product_id` INT NOT NULL,`product_option_id` INT NOT NULL,`product_option_value_id` INT NOT NULL DEFAULT '0',+`option` TEXT NOT NULL,`name` TEXT NOT NULL,-`value` text NOT NULL,-`type` TEXT NOT NULL+`price` decimal(15,4) NOT NULL DEFAULT '0.0000',+`type` TEXT NOT NULL DEFAULT ''-- PRIMARY KEY (`order_product_option_id`));\ No newline at end of filediff --git a/install/sql/sqlite/schema/subscription/subscription_plan.sql b/install/sql/sqlite/schema/subscription/subscription_plan.sqlindex 1c9b777..b1a153c 100644--- a/install/sql/sqlite/schema/subscription/subscription_plan.sql+++ b/install/sql/sqlite/schema/subscription/subscription_plan.sql@@ -10,6 +10,6 @@ CREATE TABLE `subscription_plan` (`trial_cycle` INT NOT NULL,`trial_status` tinyint(4) NOT NULL,`status` tinyint NOT NULL,- `sort_order` int(3) NOT NULL+ `sort_order` int(3) NOT NULL DEFAULT 0-- PRIMARY KEY (`subscription_plan_id`));