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

config/database.php

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

themes/gokbakja/pages/machine/rulon-bags.htm

@@ -177,7 +177,7 @@ function onStart(){
 
                                 {% set allInKg = (sumOfBags * gramInkg) %}
 
-                                {% set percentDefective = ((report.product.defective_bag_qty * 100) / report.amount) %}
+                                {% set percentDefective = ((report.product.defective_bag_qty * 100) / sumOfBags) %}
 
                                 {% set allCalc = (allCalc + report.amount) %}
 
@@ -202,7 +202,7 @@ function onStart(){
                                 <td>{{report.product.rulon_action.product.color.name}}</td>
                                 <td>{{report.product.rulon_action.product.width}}</td>
                                 <td>{{report.product.rulon_action.product.gram}}</td>
-                                <td>{{report.product.rulon_action.product.produced_weight}}</td>
+                                <td>{{report.product.rulon_action.product.brutto_kg}}</td>
 
                                 <td>{{gramInkg}}</td>
                                 <td>{{report.product.width}}</td>
@@ -300,4 +300,4 @@ function onStart(){
 <script src="{{'assets/libs/bootstrap-datepicker/js/bootstrap-datepicker.min.js'|theme}}"></script>
 <script src="{{'assets/libs/select2/js/select2.min.js'|theme}}"></script>
 <script src="{{'assets/js/pages/form-advanced.init.js'|theme}}"></script>
-{% endput %}
+{% endput %}

themes/gokbakja/pages/sewer/new.htm

@@ -115,7 +115,7 @@ function onStart(){
                                             {{machineProduction.product.bag_type.name}},
                                             {{machineProduction.product.color.name}}
 
-                                            --({{machineProduction.quantity}} kg)
+                                            --({{machineProduction.product.brutto_kg}} kg)
                                         </option>
                                         {% endif %}
                                         {% endfor %}
@@ -289,4 +289,4 @@ function onStart(){
 </script>
 
 {% endput %}
-{% partial 'dataTableJs' %}
+{% partial 'dataTableJs' %}