Merge branch 'main' of https://git.digital-tps.tk/Shohrat/g_sto into main

config/database.php

@@ -57,9 +57,9 @@ return [
             'engine' => 'InnoDB',
             'host' => 'localhost',
             'port' => 3306,
-            'database' => 'gok_bakja_stock',
+            'database' => 'gok_bakja',
             'username' => 'root',
-            'password' => 'bt110226',
+            'password' => '',
             'charset' => 'utf8mb4',
             'collation' => 'utf8mb4_unicode_ci',
             'prefix' => '',

old

@@ -0,0 +1 @@
+Subproject commit b321aad179c8f657324887a63e4eb1f838913edf

plugins/romanah/gokbakja/components/Production.php

@@ -117,7 +117,7 @@ class Production extends ComponentBase
 
 
                 for ($i = 0; $i < count($productionsFiltered[$x]->pivot_production); $i++) {
-                    $html_data .= '<td> <a href="#">' . number_format($productionsFiltered[$x]->pivot_production[$i]->amount_percentage) . '% </a></td>';
+                    $html_data .= '<td> <a href="#">' . number_format($productionsFiltered[$x]->pivot_production[$i]->amount_percentage, 2) . '% </a></td>';
                 }
 
                 $html_data .= '<td style="font-weight: bold;color: #0005c5;">' . $productionsFiltered[$x]->note . '</td>
@@ -494,7 +494,7 @@ class Production extends ComponentBase
             $createProduction->shift_id = $data["shift_id"];
             $createProduction->save();
 
-            $products = ProductModel::where("report", "simple")->get();
+            $products = ProductModel::where("report", "simple")->orderBy('order', 'ASC')->get();
 
             for ($x = 0; $x < count($products); $x++) {
                 $fieldName = "product_" . $products[$x]->id;

plugins/romanah/gokbakja/models/PivotProduction.php

@@ -16,7 +16,8 @@ class PivotProduction extends Model
     public $hasMany = [
         'pivot_production_calculate' => [
             'Romanah\Gokbakja\Models\ProductionCalculate',
-            'key' => 'prev_pivot_id'
+            'key' => 'prev_pivot_id',
+            'softDelete' => true
         ]
     ];
 

plugins/romanah/gokbakja/models/shift/columns.yaml

@@ -4,10 +4,10 @@ columns:
         type: number
     start:
         label: start
-        type: text
+        type: time
     end:
         label: end
-        type: text
+        type: time
     desc:
         label: desc
         type: text

themes/gokbakja/pages/production/all-production-month.htm

@@ -9,7 +9,7 @@ function onStart() {
     $this["month"] = $this->param("month");
     $year = $this->param("year");
 
-    $this["reportProducts"] = Romanah\Gokbakja\Models\Product::where("report", "simple")->get();
+    $this["reportProducts"] = Romanah\Gokbakja\Models\Product::where("report", "simple")->orderBy('order', 'ASC')->get();
 
     if($this["month"] == 'default'){
         $this["month"] = $currentDate->month;
@@ -110,7 +110,7 @@ function onStart() {
                                     <th>Senesi</th>
                                     <th>Hemmesi</th>
                                     {% for key, record in reportProducts %}
-                                    <th>{{record.name}}</th>
+                                    <th>{{record.code}}</th>
                                     {% endfor %}
                                     <th>Bellik</th>
                                     <!--  <th>Настройки</th> -->
@@ -159,7 +159,7 @@ function onStart() {
                                     <th>Senesi</th>
                                     <th>Hemmesi</th>
                                     {% for key, record in reportProducts %}
-                                    <th>{{record.name}}</th>
+                                    <th>{{record.code}}</th>
                                     {% endfor %}
                                     <th>Bellik</th>
                                 </tr>

themes/gokbakja/pages/production/report-production.htm

@@ -14,7 +14,7 @@ function onStart(){
     }
 
 
-    $this["reportProducts"] = Romanah\Gokbakja\Models\Product::where("report", "simple")->get();
+    $this["reportProducts"] = Romanah\Gokbakja\Models\Product::where("report", "simple")->orderBy('order', 'ASC')->get();
 }
 ?>
 ==
@@ -56,7 +56,7 @@ function onStart(){
                                 <th>Aýlar</th>
                                 <th>Işlenen çig mal</th>
                                 {% for key, record in reportProducts %}
-                                <th>{{record.name}}</th>
+                                <th>{{record.code}}</th>
                                 {% endfor %}
                                 <th>Bellik</th>
                                 <!--  <th>Настройки</th> -->
@@ -86,7 +86,7 @@ function onStart(){
                                 <th>Aýlar</th>
                                 <th>Işlenen çig mal</th>
                                 {% for key, record in reportProducts %}
-                                <th>{{record.name}}</th>
+                                <th>{{record.code}}</th>
                                 {% endfor %}
                                 <th>Bellik</th>
                             </tr>