diff --git a/plugins/rainlab/user/updates/users_add_permission2.php b/plugins/rainlab/user/updates/users_add_permission2.php
index 498fe1a..d9d6022 100644
--- a/plugins/rainlab/user/updates/users_add_permission2.php
+++ b/plugins/rainlab/user/updates/users_add_permission2.php
@@ -9,7 +9,7 @@ class UsersAddPermission2 extends Migration
{
Schema::table('users', function($table)
{
- $table->text('permission2')->default('[{"code":"dashboard"},{"code":"producedStocks"},{"code":"bagActions"},{"code":"rulonActions"},{"code":"rawStocks"},{"code":"rawActions"},{"code":"extrudorProduction"},{"code":"productionRulon"},{"code":"sewerProduction"},{"code":"orders"},{"code":"acceptAccountant"},{"code":"rawActionsCrud"},{"code":"crudExtrudor"},{"code":"inboxProductionRulon"},{"code":"crudProductionRulon"},{"code":"crudSewerProduction"},{"code":"crudOrders"}]')->nullable();
+ $table->text('permission2')->nullable();
});
}
diff --git a/plugins/romanah/gokbakja/components/Order.php b/plugins/romanah/gokbakja/components/Order.php
index 9678904..08298cf 100644
--- a/plugins/romanah/gokbakja/components/Order.php
+++ b/plugins/romanah/gokbakja/components/Order.php
@@ -280,6 +280,7 @@ class Order extends ComponentBase
' . ($x + 1) . ' |
Sargyt #' . $orderDatas[$x]->id . ' |
' . $orderDatas[$x]->client->name . ' |
+ ' . ($orderDatas[$x]->contract_no ?? "") . ' |
' . $orderDatas[$x]->client->country . ' |
' . number_format($orderDatas[$x]->order_all_price) . ' $
@@ -1188,6 +1189,7 @@ class Order extends ComponentBase
$createOrder = new OrderModel();
$createOrder->client_id = $data["client_id"];
$createOrder->note = $data["note"];
+ $createOrder->contract_no = $data["contract_no"];
$createOrder->shipping_id = 0;
$createOrder->user_id = $user->id;
$createOrder->save();
diff --git a/plugins/romanah/gokbakja/components/OrderItem.php b/plugins/romanah/gokbakja/components/OrderItem.php
index 7cd8ab2..c5eaf2d 100644
--- a/plugins/romanah/gokbakja/components/OrderItem.php
+++ b/plugins/romanah/gokbakja/components/OrderItem.php
@@ -70,9 +70,9 @@ class OrderItem extends ComponentBase
if($stockCalc > 0){
- $notCompleteCalc = ' +'.($stockCalc - $amountCalc).' artyk';
- }else{
- $notCompleteCalc = ''.($stockCalc - $amountCalc).' ýetenok';
+ $notCompleteCalc = ' +'.number_format(($stockCalc - $amountCalc), 2).' artyk';
+ }elseif($stockCalc < 0){
+ $notCompleteCalc = ''.number_format(($stockCalc - $amountCalc), 2).' ýetenok';
}
}else{
@@ -109,9 +109,9 @@ class OrderItem extends ComponentBase
if($stockCalc > 0){
- $notCompleteCalc = ' +'.($stockCalc - $amountCalc).' artyk';
- }else{
- $notCompleteCalc = ''.($stockCalc - $amountCalc).' ýetenok';
+ $notCompleteCalc = ' +'.number_format(($stockCalc - $amountCalc), 2).' artyk';
+ }elseif($stockCalc < 0){
+ $notCompleteCalc = ''.number_format(($stockCalc - $amountCalc), 2).' ýetenok';
}
diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_order_8.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_order_8.php
new file mode 100644
index 0000000..7aa6b90
--- /dev/null
+++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_order_8.php
@@ -0,0 +1,23 @@
+string('contract_no')->nullable();
+ });
+ }
+
+ public function down()
+ {
+ Schema::table('romanah_gokbakja_order', function($table)
+ {
+ $table->dropColumn('contract_no');
+ });
+ }
+}
diff --git a/plugins/romanah/gokbakja/updates/version.yaml b/plugins/romanah/gokbakja/updates/version.yaml
index 2911571..9d6c13f 100644
--- a/plugins/romanah/gokbakja/updates/version.yaml
+++ b/plugins/romanah/gokbakja/updates/version.yaml
@@ -357,3 +357,6 @@
1.0.120:
- 'Created table romanah_gokbakja_user_permission'
- builder_table_create_romanah_gokbakja_user_permission.php
+1.0.121:
+ - 'Updated table romanah_gokbakja_order'
+ - builder_table_update_romanah_gokbakja_order_8.php
diff --git a/themes/gokbakja/layouts/platform_main.htm b/themes/gokbakja/layouts/platform_main.htm
index 2d5cd5d..4602617 100644
--- a/themes/gokbakja/layouts/platform_main.htm
+++ b/themes/gokbakja/layouts/platform_main.htm
@@ -17,6 +17,7 @@ function onStart(){
$link = $this->page["url"];
+ if(\Auth::user()){
$acceptPermissions = \Auth::user()->permission2;
$this["isDirector"] = false;
@@ -93,7 +94,7 @@ function onStart(){
$this["rawActions"] = true;
}
-
+ }
}
?>
==
diff --git a/themes/gokbakja/pages/orders/new.htm b/themes/gokbakja/pages/orders/new.htm
index 117f178..117dd65 100644
--- a/themes/gokbakja/pages/orders/new.htm
+++ b/themes/gokbakja/pages/orders/new.htm
@@ -50,6 +50,13 @@ function onStart(){
-->
+
+
+
+
+
+
+
@@ -98,6 +105,7 @@ function onStart(){
№ |
Sargyt No |
Klent |
+ Şertnama Nomeri |
Ýurdy |
Bahasy |
Tölenen |
@@ -115,6 +123,7 @@ function onStart(){
№ |
Sargyt No |
Klent |
+ Şertnama Nomeri |
Ýurdy |
Bahasy |
Tölenen |
|