diff --git a/config/database.php b/config/database.php index 163d3d4..cd32e88 100644 --- a/config/database.php +++ b/config/database.php @@ -57,9 +57,9 @@ return [ 'engine' => 'InnoDB', 'host' => 'localhost', 'port' => 3306, - 'database' => 'gok_bakja_12', + 'database' => 'gok_bakja_from_server', 'username' => 'root', - 'password' => '', + 'password' => 'bt110226', 'charset' => 'utf8mb4', 'collation' => 'utf8mb4_unicode_ci', 'prefix' => '', diff --git a/plugins/romanah/gokbakja/components/LoadTransport.php b/plugins/romanah/gokbakja/components/LoadTransport.php index 121e2e6..b503f96 100644 --- a/plugins/romanah/gokbakja/components/LoadTransport.php +++ b/plugins/romanah/gokbakja/components/LoadTransport.php @@ -244,7 +244,7 @@ class LoadTransport extends ComponentBase ->where('color_id', $color); }) ->with(['product' => function($q){ - $q->with(['bag_type', 'bag_size', 'color']); + $q->with(['bag_type', 'bag_size', 'color', 'machine']); }]) ->where("stock_id", $stock->id) //->where("status_accountant", "accept") diff --git a/themes/gokbakja/pages/orders/transportloaded.htm b/themes/gokbakja/pages/orders/transportloaded.htm index b45985e..b05d199 100644 --- a/themes/gokbakja/pages/orders/transportloaded.htm +++ b/themes/gokbakja/pages/orders/transportloaded.htm @@ -24,7 +24,7 @@ function onStart(){ $this["orderItems"] = Romanah\Gokbakja\Models\OrderItem::where("order_id", $orderId)->orderBy('id', 'DESC')->get(); - $this["loadedItems"] = Romanah\Gokbakja\Models\LoadTransport::where("order_id", $orderId)->where("transport_id", $this["transportId"])->with("order_item")->orderBy("id", "DESC")->get(); + $this["loadedItems"] = Romanah\Gokbakja\Models\LoadTransport::where("order_id", $orderId)->where("transport_id", $this["transportId"])->with("order_item")->with('product.machine')->orderBy("id", "DESC")->get(); $this["transport"] = Romanah\Gokbakja\Models\ShippingTransport::where("id", $this["transportId"] )->first(); @@ -194,7 +194,8 @@ function onStart(){ #{{loadedItem.order_item_id}} {% if loadedItem.order_item.order_item_type == 'rulon' %} - #Rulon{{loadedItem.product_id}}-({{loadedItem.product.produced_weight}}), Jemi: {{loadedItem.order_item.amount}} kg + #Rulon{{loadedItem.product_id}} - Enjam: {{loadedItem.product.machine.name}} - (netto: {{loadedItem.product.produced_weight}} , + brutto: {{loadedItem.product.brutto_kg}}) , Sargyt edilen Jemi: {{loadedItem.order_item.amount}} kg {% else %} #Halta{{loadedItem.product_id}}, Jemi: {{loadedItem.order_item.amount}} sany, {{loadedItem.order_item.bag_gram}} gr {% endif %} @@ -285,7 +286,7 @@ function onStart(){ if(data.productFromStock.orderItemType == "rulon"){ var option = ''; for (var item of data.productFromStock.products) { - option += ``; + option += ``; } dropDownProducts +=option; // console.log(option);