order transports
This commit is contained in:
parent
73fe5a9d55
commit
c5c62ad35b
|
|
@ -14,6 +14,7 @@ class Plugin extends PluginBase
|
|||
'Romanah\Gokbakja\Components\Order' => 'order',
|
||||
'Romanah\Gokbakja\Components\OrderItem' => 'orderItem',
|
||||
'Romanah\Gokbakja\Components\Journal' => 'journal',
|
||||
'Romanah\Gokbakja\Components\LoadTransport' => 'loadTransport',
|
||||
];
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,138 @@
|
|||
<?php
|
||||
|
||||
namespace Romanah\Gokbakja\Components;
|
||||
|
||||
use Cms\Classes\ComponentBase;
|
||||
use Romanah\Gokbakja\Models\Production as ProductionModel;
|
||||
use Romanah\Gokbakja\Models\PivotProduction as PivotProductionModel;
|
||||
use Romanah\Gokbakja\Models\SewerProduction as SewerModel;
|
||||
use Redirect;
|
||||
use Carbon\Carbon;
|
||||
use Flash;
|
||||
use DB;
|
||||
use Romanah\Gokbakja\Models\Journal as ModelsJournal;
|
||||
use Romanah\Gokbakja\Models\LoadTransport as ModelsLoadTransport;
|
||||
use Romanah\Gokbakja\Models\ProductionMachine;
|
||||
use Romanah\Gokbakja\Models\PivotSewer;
|
||||
|
||||
class LoadTransport extends ComponentBase
|
||||
{
|
||||
|
||||
|
||||
public function componentDetails()
|
||||
{
|
||||
return [
|
||||
'name' => 'LoadTransport',
|
||||
'description' => 'LoadTransport settings'
|
||||
];
|
||||
}
|
||||
|
||||
public function onDeleteItem(){
|
||||
$data = post();
|
||||
$loadedItem = ModelsLoadTransport::where("id", $data["itemId"])->first();
|
||||
$loadedItem->delete();
|
||||
|
||||
if ($loadedItem) {
|
||||
Flash::success("Ustunlikli Pozuldy");
|
||||
return Redirect::refresh();
|
||||
} else {
|
||||
Flash::error("Yalnyshlyk bar!!");
|
||||
return Redirect::refresh();
|
||||
}
|
||||
}
|
||||
|
||||
public function onSetUpdateForm(){
|
||||
$data = post();
|
||||
$loadedItem = ModelsLoadTransport::where("id", $data["itemId"])->first();
|
||||
|
||||
$html_data = '<div class="modal-header">
|
||||
<h5 class="modal-title" id="mySmallModalLabel">Yüklenen Tapgyr kody #'.$loadedItem->id.'</h5>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal"
|
||||
aria-label="Close"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<form data-request="onUpdateLoadItem" data-request-flash data-request-validate>
|
||||
|
||||
<div class="row">
|
||||
|
||||
<div class="col-md-12 mt-3">
|
||||
<div>
|
||||
<label class="form-label">Ýüklenmeli Mukdar</label>
|
||||
<input type="number" step="0.01" name="loaded_amount" class="form-control"
|
||||
placeholder="Ýüklenmeli Mukdar" value="'.$loadedItem->loaded_amount.'">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-12 mt-3">
|
||||
<div>
|
||||
<label class="form-label">Bellik</label>
|
||||
<input type="text" name="note" class="form-control"
|
||||
placeholder="Bellik" value="'.$loadedItem->note.'">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<input type="hidden" name="loadId" value="'.$loadedItem->id.'">
|
||||
<div class="col-md-12 mt-3">
|
||||
<button type="submit" class="btn btn-primary waves-effect waves-light"
|
||||
style="margin-top: 30px;width: 100%;">Üýtget</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>';
|
||||
|
||||
return [
|
||||
'#modal-form' => $html_data,
|
||||
];
|
||||
}
|
||||
|
||||
public function onUpdateLoadItem(){
|
||||
$data = post();
|
||||
|
||||
$loadedItem = ModelsLoadTransport::where("id", $data["loadId"])->first();
|
||||
$loadedItem->loaded_amount = $data["loaded_amount"];
|
||||
$loadedItem->note = $data["note"];
|
||||
$loadedItem->save();
|
||||
|
||||
if ($loadedItem) {
|
||||
Flash::success("Ustunlikli Uytgedildi");
|
||||
return Redirect::refresh();
|
||||
} else {
|
||||
Flash::error("Yalnyshlyk bar!!");
|
||||
return Redirect::refresh();
|
||||
}
|
||||
}
|
||||
|
||||
public function onCreateLoadItem(){
|
||||
$data = post();
|
||||
$orderId = $this->param("orderId");
|
||||
$transportId = $this->param("transportId");
|
||||
|
||||
$loadedItem = new ModelsLoadTransport();
|
||||
$loadedItem->order_id = $orderId;
|
||||
$loadedItem->order_item_id = $data["order_item_id"];
|
||||
$loadedItem->loaded_amount = $data["loaded_amount"];
|
||||
$loadedItem->note = $data["note"];
|
||||
$loadedItem->transport_id = $transportId;
|
||||
$loadedItem->save();
|
||||
|
||||
if ($loadedItem) {
|
||||
Flash::success("Haryt Transporta Ustunlikli Yuklendi");
|
||||
return Redirect::refresh();
|
||||
} else {
|
||||
Flash::error("Yalnyshlyk bar!!");
|
||||
return Redirect::refresh();
|
||||
}
|
||||
}
|
||||
|
||||
public function onCalculateLoaded(){
|
||||
$data = post();
|
||||
$orderId = $this->param("orderId");
|
||||
|
||||
$loadedItemSum = ModelsLoadTransport::where("order_item_id", $data["item_id"])->where("order_id", $orderId)->sum("loaded_amount");
|
||||
// dd($loadedItemSum);
|
||||
return array("loadedSum"=>$loadedItemSum);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -20,6 +20,7 @@ class Order extends ComponentBase
|
|||
{
|
||||
|
||||
|
||||
|
||||
public function componentDetails()
|
||||
{
|
||||
return [
|
||||
|
|
@ -140,7 +141,11 @@ class Order extends ComponentBase
|
|||
$data = post();
|
||||
|
||||
|
||||
$shippingTransports = ShippingTransportModel::with("shipping.order")->orderBy('shipping_id', 'DESC');
|
||||
$shippingTransports = ShippingTransportModel::with("shipping.order")
|
||||
// ->withCount(['loaded_items as loaded_item_amount' => function($query) {
|
||||
// $query->select(DB::raw('sum(loaded_amount)'));
|
||||
// }])
|
||||
->orderBy('shipping_id', 'DESC');
|
||||
|
||||
// $start = Carbon::parse($data["start"])->format('Y-m-d');
|
||||
// $end = Carbon::parse($data["end"])->format('Y-m-d');;
|
||||
|
|
@ -172,7 +177,13 @@ class Order extends ComponentBase
|
|||
// }
|
||||
|
||||
$shippingTransportsFiltered = $shippingTransports->get();
|
||||
$shippingTransportsAmountLoaded = $shippingTransports->sum("loaded_amount");
|
||||
|
||||
// dd($shippingTransports->loaded_item_amount);
|
||||
|
||||
$shippingTransportsAmountLoaded = $shippingTransports
|
||||
->withCount(['loaded_items as loaded_item_amount' => function($query) {
|
||||
$query->select(DB::raw('sum(loaded_amount)'));
|
||||
}])->first();
|
||||
|
||||
|
||||
$html_data = '';
|
||||
|
|
@ -190,20 +201,33 @@ class Order extends ComponentBase
|
|||
style="font-size: 14px;">ÝÜKLENÝÄR</span>';
|
||||
}
|
||||
|
||||
if ($shippingTransportsFiltered[$x]->status == "proccess") {
|
||||
$status = '<span class="badge badge-soft-warning"
|
||||
style="font-size: 14px;">ÝOLDA</span>';
|
||||
}
|
||||
|
||||
if ($shippingTransportsFiltered[$x]->status == "complated") {
|
||||
$status = '<span class="badge badge-soft-success"
|
||||
style="font-size: 14px;">ÝERINE ÝETIRILDI</span>';
|
||||
style="font-size: 14px;">TAMAMLANDY</span>';
|
||||
}
|
||||
|
||||
$transportTitle = '';
|
||||
if($shippingTransportsFiltered[$x]->transport_type == 'truck')
|
||||
|
||||
$transportTitle = 'TYR';
|
||||
|
||||
else{
|
||||
$transportTitle = "WAGON";
|
||||
}
|
||||
|
||||
$html_data .= '<tr>
|
||||
<td style="font-weight: bold;">' . ($x + 1) . '</td>
|
||||
<td><a href="/order-detail/logistics/' . $shippingTransportsFiltered[$x]->shipping->order->id . '" style="font-weight: bold;">' . $shippingTransportsFiltered[$x]->transport_type . '</a></td>
|
||||
<td><a href="/orders/transport/loaded/' . $shippingTransportsFiltered[$x]->shipping->order->id . '/'.$shippingTransportsFiltered[$x]->id.'" style="font-weight: bold;">' . $transportTitle . '</a></td>
|
||||
<td>' . $shippingTransportsFiltered[$x]->transport_no . '</td>
|
||||
<td><a href="/order-detail/' . $shippingTransportsFiltered[$x]->shipping->order->id . '" style="font-weight: bold;">Sargyt #' . $shippingTransportsFiltered[$x]->shipping->order->id . '</a></td>
|
||||
<td>' . $shippingTransportsFiltered[$x]->place_now . '</td>
|
||||
<td><span class="badge badge-soft-success"
|
||||
style="font-size: 14px;">' . $shippingTransportsFiltered[$x]->loaded_amount . ' kg</span>
|
||||
</td>
|
||||
|
||||
|
||||
<td>' . $shippingTransportsFiltered[$x]->place_now . '</td>
|
||||
<td>' . $status . '</td>
|
||||
<td>' . $shippingTransportsFiltered[$x]->note . '</td>
|
||||
</tr>';
|
||||
|
|
@ -215,13 +239,6 @@ class Order extends ComponentBase
|
|||
'#all_amount' => ' <div class="col-md-6">
|
||||
<h3 class="card-title" style="font-size: 22px;color: #1e2038;">Logistika Boýunça Umumy</h3>
|
||||
<p class="card-title-desc" style="color: #6c6ff5;">Hasabat</p>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="card bg-info text-white-50">
|
||||
<div class="card-body">
|
||||
<h5 class="text-white" style="text-transform: uppercase;margin-bottom: 0;"><i class="mdi mdi-bullseye-arrow me-3"></i> Ýük Mukdary: ' . number_format($shippingTransportsAmountLoaded) . ' kg</h5>
|
||||
</div>
|
||||
</div>
|
||||
</div>',
|
||||
];
|
||||
} else {
|
||||
|
|
@ -647,6 +664,7 @@ class Order extends ComponentBase
|
|||
|
||||
<option value="loading" ' . ($transportItem->status == "loading" ? "selected" : "") . '>Ýüklenýär</option>
|
||||
<option value="loaded" ' . ($transportItem->status == "loaded" ? "selected" : "") . '>Ýüklendi</option>
|
||||
<option value="proccess" ' . ($transportItem->status == "proccess" ? "selected" : "") . '>Ýolda</option>
|
||||
<option value="complated" ' . ($transportItem->status == "complated" ? "selected" : "") . '>Ýerine Ýetirildi</option>
|
||||
|
||||
</select>
|
||||
|
|
@ -675,13 +693,6 @@ class Order extends ComponentBase
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12 mt-3">
|
||||
<div>
|
||||
<label class="form-label">Ýüklenen Mukdar (kg)</label>
|
||||
<input type="number" name="loaded_amount" step="0.01" class="form-control"
|
||||
placeholder="Ýüklenen Mukdar (kg)" value="' . $transportItem->loaded_amount . '">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-12 mt-3">
|
||||
<div>
|
||||
|
|
@ -730,9 +741,6 @@ class Order extends ComponentBase
|
|||
$query->select(DB::raw('sum(amount)'));
|
||||
}])->first();
|
||||
|
||||
$transportAmountSum = ShippingTransportModel::where("shipping_id", $orderq->shipping_id)->sum('loaded_amount');
|
||||
|
||||
$allLoadedAmount = $transportAmountSum + $data["loaded_amount"];
|
||||
|
||||
// dd($allLoadedAmount);
|
||||
// if ($orderq->order_all_amount < $allLoadedAmount) {
|
||||
|
|
@ -742,7 +750,6 @@ class Order extends ComponentBase
|
|||
|
||||
$createShippingTransport->transport_type = $data["transport_type"];
|
||||
$createShippingTransport->place_now = $data["place_now"];
|
||||
$createShippingTransport->loaded_amount = $data["loaded_amount"];
|
||||
$createShippingTransport->transport_no = $data["transport_no"];
|
||||
$createShippingTransport->date = Carbon::parse($data["date"])->format('Y-m-d');
|
||||
$createShippingTransport->status = $data["status"];
|
||||
|
|
@ -833,12 +840,10 @@ class Order extends ComponentBase
|
|||
$createShippingTransport = new ShippingTransportModel();
|
||||
$createShippingTransport->transport_type = $data["transport_type"];
|
||||
$createShippingTransport->place_now = "Aşgabat";
|
||||
$createShippingTransport->loaded_amount = $data["loaded_amount"];
|
||||
$createShippingTransport->transport_no = $data["transport_no"];
|
||||
$createShippingTransport->note = $data["note"];
|
||||
$createShippingTransport->shipping_id = $orderq->shipping_id;
|
||||
$createShippingTransport->order_id = $orderId;
|
||||
$createShippingTransport->order_item_id = $data["order_item_id"];
|
||||
$createShippingTransport->save();
|
||||
|
||||
// $html_data = '';
|
||||
|
|
|
|||
|
|
@ -0,0 +1,37 @@
|
|||
<?php namespace Romanah\Gokbakja\Models;
|
||||
|
||||
use Model;
|
||||
|
||||
/**
|
||||
* Model
|
||||
*/
|
||||
class LoadTransport extends Model
|
||||
{
|
||||
use \October\Rain\Database\Traits\Validation;
|
||||
|
||||
use \October\Rain\Database\Traits\SoftDelete;
|
||||
|
||||
protected $dates = ['deleted_at'];
|
||||
|
||||
public $belongsTo = [
|
||||
'order_item' => [
|
||||
'Romanah\Gokbakja\Models\OrderItem',
|
||||
'key' => 'order_item_id'
|
||||
],
|
||||
'shipping_transport' => [
|
||||
'Romanah\Gokbakja\Models\ShippingTransport',
|
||||
'key' => 'transport_id'
|
||||
],
|
||||
];
|
||||
|
||||
/**
|
||||
* @var string The database table used by the model.
|
||||
*/
|
||||
public $table = 'romanah_gokbakja_load_transport';
|
||||
|
||||
/**
|
||||
* @var array Validation rules
|
||||
*/
|
||||
public $rules = [
|
||||
];
|
||||
}
|
||||
|
|
@ -19,6 +19,15 @@ class ShippingTransport extends Model
|
|||
*/
|
||||
public $table = 'romanah_gokbakja_shipping_transport';
|
||||
|
||||
public $hasMany = [
|
||||
'loaded_items' => [
|
||||
'Romanah\Gokbakja\Models\LoadTransport',
|
||||
'key' => 'transport_id',
|
||||
'softDelete' => true
|
||||
]
|
||||
|
||||
];
|
||||
|
||||
public $belongsTo = [
|
||||
'shipping' => [
|
||||
'Romanah\Gokbakja\Models\Shipping',
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
<?php namespace Romanah\Gokbakja\Updates;
|
||||
|
||||
use Schema;
|
||||
use October\Rain\Database\Updates\Migration;
|
||||
|
||||
class BuilderTableCreateRomanahGokbakjaLoadTransport extends Migration
|
||||
{
|
||||
public function up()
|
||||
{
|
||||
Schema::create('romanah_gokbakja_load_transport', function($table)
|
||||
{
|
||||
$table->engine = 'InnoDB';
|
||||
$table->increments('id')->unsigned();
|
||||
$table->timestamp('created_at')->nullable();
|
||||
$table->timestamp('updated_at')->nullable();
|
||||
$table->timestamp('deleted_at')->nullable();
|
||||
$table->integer('order_id');
|
||||
$table->integer('order_item_id');
|
||||
$table->double('loaded_amount', 10, 0);
|
||||
$table->text('note');
|
||||
});
|
||||
}
|
||||
|
||||
public function down()
|
||||
{
|
||||
Schema::dropIfExists('romanah_gokbakja_load_transport');
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
<?php namespace Romanah\Gokbakja\Updates;
|
||||
|
||||
use Schema;
|
||||
use October\Rain\Database\Updates\Migration;
|
||||
|
||||
class BuilderTableUpdateRomanahGokbakjaLoadTransport extends Migration
|
||||
{
|
||||
public function up()
|
||||
{
|
||||
Schema::table('romanah_gokbakja_load_transport', function($table)
|
||||
{
|
||||
$table->integer('transport_id');
|
||||
});
|
||||
}
|
||||
|
||||
public function down()
|
||||
{
|
||||
Schema::table('romanah_gokbakja_load_transport', function($table)
|
||||
{
|
||||
$table->dropColumn('transport_id');
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
<?php namespace Romanah\Gokbakja\Updates;
|
||||
|
||||
use Schema;
|
||||
use October\Rain\Database\Updates\Migration;
|
||||
|
||||
class BuilderTableUpdateRomanahGokbakjaShippingTransport6 extends Migration
|
||||
{
|
||||
public function up()
|
||||
{
|
||||
Schema::table('romanah_gokbakja_shipping_transport', function($table)
|
||||
{
|
||||
$table->dropColumn('loaded_amount');
|
||||
$table->dropColumn('order_id');
|
||||
$table->dropColumn('order_item_id');
|
||||
});
|
||||
}
|
||||
|
||||
public function down()
|
||||
{
|
||||
Schema::table('romanah_gokbakja_shipping_transport', function($table)
|
||||
{
|
||||
$table->double('loaded_amount', 10, 0)->default(0);
|
||||
$table->integer('order_id')->nullable();
|
||||
$table->integer('order_item_id')->nullable();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
<?php namespace Romanah\Gokbakja\Updates;
|
||||
|
||||
use Schema;
|
||||
use October\Rain\Database\Updates\Migration;
|
||||
|
||||
class BuilderTableUpdateRomanahGokbakjaShippingTransport7 extends Migration
|
||||
{
|
||||
public function up()
|
||||
{
|
||||
Schema::table('romanah_gokbakja_shipping_transport', function($table)
|
||||
{
|
||||
$table->integer('order_id')->nullable();
|
||||
});
|
||||
}
|
||||
|
||||
public function down()
|
||||
{
|
||||
Schema::table('romanah_gokbakja_shipping_transport', function($table)
|
||||
{
|
||||
$table->dropColumn('order_id');
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -318,3 +318,15 @@
|
|||
1.0.107:
|
||||
- 'Updated table romanah_gokbakja_shipping_transport'
|
||||
- builder_table_update_romanah_gokbakja_shipping_transport_5.php
|
||||
1.0.108:
|
||||
- 'Updated table romanah_gokbakja_shipping_transport'
|
||||
- builder_table_update_romanah_gokbakja_shipping_transport_6.php
|
||||
1.0.109:
|
||||
- 'Created table romanah_gokbakja_load_transport'
|
||||
- builder_table_create_romanah_gokbakja_load_transport.php
|
||||
1.0.110:
|
||||
- 'Updated table romanah_gokbakja_shipping_transport'
|
||||
- builder_table_update_romanah_gokbakja_shipping_transport_7.php
|
||||
1.0.111:
|
||||
- 'Updated table romanah_gokbakja_load_transport'
|
||||
- builder_table_update_romanah_gokbakja_load_transport.php
|
||||
|
|
|
|||
|
|
@ -13,27 +13,56 @@ items:
|
|||
cssClass: ri-home-gear-line
|
||||
isExternal: '0'
|
||||
-
|
||||
title: Skladlar
|
||||
nesting: null
|
||||
title: 'Taýyn Önüm Sklady'
|
||||
type: url
|
||||
url: /
|
||||
code: ''
|
||||
viewBag:
|
||||
isHidden: '0'
|
||||
cssClass: ri-dashboard-line
|
||||
isExternal: '0'
|
||||
-
|
||||
title: 'Taýyn Önüm Hereketler'
|
||||
type: url
|
||||
url: /dsadasd
|
||||
code: ''
|
||||
viewBag:
|
||||
isHidden: '0'
|
||||
cssClass: ' ri-check-double-line'
|
||||
isExternal: '0'
|
||||
items:
|
||||
-
|
||||
title: 'Rulon Herkedi'
|
||||
type: url
|
||||
url: /adgh
|
||||
code: ''
|
||||
viewBag:
|
||||
isHidden: '0'
|
||||
cssClass: ''
|
||||
isExternal: '0'
|
||||
-
|
||||
title: 'Haltalar Herkedi'
|
||||
type: url
|
||||
url: /jg
|
||||
code: ''
|
||||
viewBag:
|
||||
isHidden: '0'
|
||||
cssClass: ''
|
||||
isExternal: '0'
|
||||
-
|
||||
title: 'Çig Mal Skladlar'
|
||||
type: cms-page
|
||||
url: null
|
||||
code: ''
|
||||
reference: stock/stocks
|
||||
cmsPage: null
|
||||
replace: null
|
||||
viewBag:
|
||||
isHidden: '0'
|
||||
cssClass: ri-store-2-line
|
||||
isExternal: '0'
|
||||
-
|
||||
title: 'Sklad Hereketleri'
|
||||
nesting: null
|
||||
title: 'Çig Mal Hereketleri'
|
||||
type: url
|
||||
url: '#a'
|
||||
code: ''
|
||||
reference: null
|
||||
cmsPage: null
|
||||
replace: null
|
||||
viewBag:
|
||||
isHidden: '0'
|
||||
cssClass: ri-arrow-up-down-line
|
||||
|
|
@ -344,9 +373,13 @@ items:
|
|||
isExternal: '0'
|
||||
-
|
||||
title: Žurnal
|
||||
nesting: null
|
||||
type: cms-page
|
||||
url: null
|
||||
code: ''
|
||||
reference: journal
|
||||
cmsPage: null
|
||||
replace: null
|
||||
viewBag:
|
||||
isHidden: '0'
|
||||
cssClass: ri-chat-history-line
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ function onStart(){
|
|||
|
||||
$this["transports"] = Romanah\Gokbakja\Models\ShippingTransport::where("shipping_id", $this["order"]->shipping_id)->with('shipping.order')->with('order_item')->orderBy("id", "DESC")->get();
|
||||
|
||||
$this["allLoaded"] = Romanah\Gokbakja\Models\ShippingTransport::where("shipping_id", $this["order"]->shipping_id)->sum("loaded_amount");
|
||||
|
||||
|
||||
}
|
||||
?>
|
||||
|
|
@ -85,32 +85,16 @@ function onStart(){
|
|||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col">
|
||||
<label class="form-label">Sargyt Harytlary</label>
|
||||
<select class="form-control select2" name="order_item_id" onchange="setLoaded(this.value);">
|
||||
<option value="0">Saýla</option>
|
||||
{% for item in orderItems %}
|
||||
<option value="{{item.id}}">#{{item.id}}
|
||||
|
||||
{% if item.order_item_type == 'rulon' %}
|
||||
Rulon - {{item.amount}} kg
|
||||
{% else %}
|
||||
Halta - {{item.bag_gram}} gr, {{item.amount}} sany
|
||||
{% endif %}
|
||||
|
||||
|
||||
|
||||
</option>
|
||||
{% endfor %}
|
||||
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col">
|
||||
<div>
|
||||
<label class="form-label">Ýüklenen Mukdar (kg)</label>
|
||||
<input type="number" name="loaded_amount" step="0.01" class="form-control"
|
||||
placeholder="Ýüklenen Mukdar (kg)">
|
||||
<label class="form-label">Ugramaly Senesi</label>
|
||||
<div class="input-group" id="datepicker2">
|
||||
<input type="text" class="form-control" placeholder="d.m.Y"
|
||||
data-date-format="d.m.yyyy" data-date-container="#datepicker2" data-provide="datepicker"
|
||||
data-date-autoclose="true" name="date">
|
||||
|
||||
<span class="input-group-text"><i class="mdi mdi-calendar"></i></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -171,15 +155,14 @@ function onStart(){
|
|||
<thead>
|
||||
<tr>
|
||||
<th style="width: 5%;">№</th>
|
||||
<th>Haryt</th>
|
||||
|
||||
<th>Transport Kody</th>
|
||||
<th>Transport</th>
|
||||
<th>Şu wagtky ýeri</th>
|
||||
<th>Ýüklenen Mukdar</th>
|
||||
<th>Transport No</th>
|
||||
<th>Ugramaly Sene</th>
|
||||
<th>Bellik</th>
|
||||
<th>Statusy</th>
|
||||
<th>Ýük Çalyşmak</th>
|
||||
<th>Sazlamalar</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
@ -187,44 +170,42 @@ function onStart(){
|
|||
{% for key, transport in transports %}
|
||||
<tr>
|
||||
<td style="font-weight: bold;">{{(key+1)}}</td>
|
||||
<td><a href="#" style="font-weight: bold;">
|
||||
{% if transport.order_item_type == 'rulon' %}
|
||||
Rulon, {{transport.order_item.order_item_type}}
|
||||
{% else %}
|
||||
Halta, {{transport.order_item.bag_gram}} gr, ini: {{transport.order_item.bag_width}} x boyy: {{transport.order_item.bag_height}}
|
||||
{% endif %}
|
||||
|
||||
</a></td>
|
||||
<td>#{{transport.id}}</td>
|
||||
<td><a href="#" style="font-weight: bold;">{{transport.transport_type}}</a></td>
|
||||
<td>{{transport.place_now}}</td>
|
||||
<td>{{transport.loaded_amount}} kg</td>
|
||||
<td>{{transport.transport_no}}</td>
|
||||
<td>{% if transport.date %}{{transport.date|date('d.m.Y')}}{% endif %}</td>
|
||||
<td>{{transport.note}}</td>
|
||||
<td style="font-weight: bold;color: #6c6ff5;">{{transport.status}}</td>
|
||||
<td>
|
||||
<td style="font-weight: bold;color: #6c6ff5;">
|
||||
{% if transport.status == "complated" %}
|
||||
<a href="#" style="color: darkgreen;"> {{transport.status}} </a>
|
||||
{% else %}
|
||||
|
||||
{% if transport.shipping.order.user_id == user.id %}
|
||||
<a href="#" data-request="onModalSetTransportChange"
|
||||
data-request-data="transportId: {{transport.id}}"
|
||||
data-bs-toggle="modal" data-bs-target=".bs-example-modal-sm-1" style="color: orange;"> Çalyşmak </a>
|
||||
{% else %}
|
||||
<a href="#" style="color: orange;"> Size degişli däl </a>
|
||||
{% endif %}
|
||||
|
||||
Tamamlandy
|
||||
{% elseif transport.status == "loaded" %}
|
||||
Ýüklendi
|
||||
{% elseif transport.status == "loading" %}
|
||||
Ýüklenýär
|
||||
{% elseif transport.status == "proccess" %}
|
||||
Ýolda
|
||||
{% endif %}
|
||||
|
||||
</td>
|
||||
|
||||
<td>
|
||||
{% if transport.status != "complated" %}
|
||||
|
||||
{% if transport.shipping.order.user_id == user.id %}
|
||||
<a href="#" data-request="onModalSetTransport"
|
||||
|
||||
<button data-request="onModalSetTransport"
|
||||
data-request-data="transportId: {{transport.id}}"
|
||||
data-bs-toggle="modal" data-bs-target=".bs-example-modal-sm-1" style="color: orange;"> Täzele </a>
|
||||
data-bs-toggle="modal" data-bs-target=".bs-example-modal-sm-1" type="button" class="btn btn-warning waves-light waves-effect"><i class="fa fa-pen"></i></button>
|
||||
|
||||
<a href="/orders/transport/loaded/{{orderId}}/{{transport.id}}" type="button" class="btn btn-primary waves-light waves-effect"><i class="fa fa-truck-loading"></i></a>
|
||||
|
||||
{% else %}
|
||||
<a href="#" style="color: orange;"> Size degişli däl </a>
|
||||
<a href="/orders/transport/loaded/{{orderId}}/{{transport.id}}" type="button" class="btn btn-primary waves-light waves-effect"><i class="fa fa-truck-loading"></i></a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
|
@ -232,15 +213,13 @@ function onStart(){
|
|||
<tfoot>
|
||||
<tr>
|
||||
<th style="width: 5%;">№</th>
|
||||
<th>Haryt</th>
|
||||
<th>Transport Kody</th>
|
||||
<th>Transport</th>
|
||||
<th>Şu wagtky ýeri</th>
|
||||
<th>Ýüklenen Mukdar</th>
|
||||
<th>Transport No</th>
|
||||
<th>Ugramaly Sene</th>
|
||||
<th>Bellik</th>
|
||||
<th>Statusy</th>
|
||||
<th>Ýük Çalyşmak</th>
|
||||
<th>Sazlamalar</th>
|
||||
</tr>
|
||||
</tfoot>
|
||||
|
|
|
|||
|
|
@ -69,6 +69,7 @@ function onStart(){
|
|||
<option value="0">Saýla</option>
|
||||
<option value="loading">Ýüklenýär</option>
|
||||
<option value="loaded">Ýüklendi</option>
|
||||
<option value="proccess">Ýolda</option>
|
||||
<option value="complated">Ýerine Ýetirildi</option>
|
||||
</select>
|
||||
</div>
|
||||
|
|
@ -112,7 +113,7 @@ function onStart(){
|
|||
<th>Transport</th>
|
||||
<th>Transport No</th>
|
||||
<th>Sargyt No</th>
|
||||
<th>Ýüki</th>
|
||||
|
||||
<th>Şu Wagtky Ýeri</th>
|
||||
<th>Status</th>
|
||||
<th>Bellik</th>
|
||||
|
|
@ -129,7 +130,7 @@ function onStart(){
|
|||
<th>Transport</th>
|
||||
<th>Transport No</th>
|
||||
<th>Sargyt No</th>
|
||||
<th>Ýüki</th>
|
||||
|
||||
<th>Şu Wagtky Ýeri</th>
|
||||
<th>Status</th>
|
||||
<th>Bellik</th>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,267 @@
|
|||
title = "orders/transportLoaded"
|
||||
url = "/orders/transport/loaded/:orderId/:transportId?"
|
||||
layout = "platform_main"
|
||||
is_hidden = 0
|
||||
|
||||
[loadTransport]
|
||||
==
|
||||
<?php
|
||||
function onStart(){
|
||||
|
||||
$this["orderId"] = $this->param("orderId");
|
||||
$this["transportId"] = $this->param("transportId");
|
||||
|
||||
$orderId = $this->param("orderId");
|
||||
|
||||
$this["order"] = Romanah\Gokbakja\Models\Order::where("id", $orderId)->with(["client", "shipping"])
|
||||
->withCount(['order_items as order_all_amount' => function($query) {
|
||||
$query->select(DB::raw('sum(amount)'));
|
||||
}])
|
||||
->withCount(['order_items as order_all_price' => function($query) {
|
||||
$query->select(DB::raw('sum(price)'));
|
||||
}])
|
||||
->first();
|
||||
|
||||
$this["orderItems"] = Romanah\Gokbakja\Models\OrderItem::where("order_id", $orderId)->get();
|
||||
|
||||
$this["loadedItems"] = Romanah\Gokbakja\Models\LoadTransport::where("order_id", $orderId)->where("transport_id", $this["transportId"])->with("order_item")->orderBy("id", "DESC")->get();
|
||||
|
||||
$this["transport"] = Romanah\Gokbakja\Models\ShippingTransport::where("id", $this["transportId"] )->first();
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
?>
|
||||
==
|
||||
{% put styles %}
|
||||
<link href="{{'assets/libs/datatables.net-bs4/css/dataTables.bootstrap4.min.css'|theme}}" rel="stylesheet"
|
||||
type="text/css" />
|
||||
<link href="{{'assets/libs/datatables.net-buttons-bs4/css/buttons.bootstrap4.min.css'|theme}}" rel="stylesheet"
|
||||
type="text/css" />
|
||||
<link href="{{'assets/libs/datatables.net-select-bs4/css/select.bootstrap4.min.css'|theme}}" rel="stylesheet"
|
||||
type="text/css" />
|
||||
|
||||
<link href="{{'assets/libs/select2/css/select2.min.css'|theme}}" rel="stylesheet" type="text/css">
|
||||
{% endput %}
|
||||
|
||||
<div class="container-fluid">
|
||||
|
||||
<!-- start page title -->
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="page-title-box d-flex align-items-center justify-content-between">
|
||||
<h4 class="mb-0">Transport Maglumatlary</h4>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- end page title -->
|
||||
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<!-- Left sidebar -->
|
||||
<div class="email-leftbar card">
|
||||
{% partial "order/aside" active=2 orderId=orderId %}
|
||||
</div>
|
||||
<!-- End Left sidebar -->
|
||||
|
||||
|
||||
<!-- Right Sidebar -->
|
||||
<div class="email-rightbar mb-3">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="collapse multi-collapse" id="multiCollapseExample1">
|
||||
<form data-request="onCreateLoadItem" data-request-flash data-request-validate>
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
|
||||
<div class="col">
|
||||
<label class="form-label">Haryt Saýlaň</label>
|
||||
<select class="form-control select2" name="order_item_id" onchange="calculateLoaded(this.value);">
|
||||
<option value="0">Saýla</option>
|
||||
{% for item in orderItems %}
|
||||
<option value="{{item.id}}">
|
||||
{% if item.order_item_type == 'rulon' %}
|
||||
#{{item.id}}-Rulon, {{item.amount}} kg
|
||||
{% else %}
|
||||
#{{item.id}}-Halta, {{item.amount}} sany, {{item.bag_gram}} gr
|
||||
{% endif %}
|
||||
</option>
|
||||
{% endfor %}
|
||||
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col">
|
||||
<div>
|
||||
<label class="form-label" id="loadedCalc">Ýüklenmeli Mukdar</label>
|
||||
<input type="number" step="0.01" name="loaded_amount" class="form-control"
|
||||
placeholder="Ýüklenmeli Mukdar">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col">
|
||||
<div>
|
||||
<label class="form-label">Bellik</label>
|
||||
<input type="text" name="note" class="form-control"
|
||||
placeholder="Bellik">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="col">
|
||||
<button type="submit" class="btn btn-primary waves-effect waves-light"
|
||||
style="margin-top: 30px;width: 100%;">Goş</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
<div class="card">
|
||||
|
||||
<div class="card-body">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-9">
|
||||
<h3 class="card-title" style="font-size: 22px;color: #1e2038;">
|
||||
Transport kody: #{{transport.id}}
|
||||
{% if transport.transport_type == "truck" %}
|
||||
Tyr
|
||||
{% else %}
|
||||
Wagon
|
||||
{% endif %}
|
||||
, Sene: {{transport.date|date('d.m.Y')}},
|
||||
{{transport.transport_no}},
|
||||
{{transport.note}}
|
||||
</h3>
|
||||
<p class="card-title-desc" style="color: #6c6ff5;font-size: 17px;" ></p>
|
||||
</div>
|
||||
<div class="col-md-3" style="text-align: right;">
|
||||
<a href="/order-detail/logistics/{{orderId}}" style="height: 38px;" type="button" class="btn btn-danger waves-effect waves-light">
|
||||
<i class="ri-arrow-left-line align-middle ms-2" style="font-size: 17px;"></i> Yza
|
||||
</a>
|
||||
{% if order.user_id == user.id %}
|
||||
<a class="btn btn-primary" data-bs-toggle="collapse" href="#multiCollapseExample1"
|
||||
role="button" aria-expanded="false" aria-controls="multiCollapseExample1">Haryt Ýükle</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<table id="datatable-buttons" class="table table-striped table-bordered dt-responsive nowrap"
|
||||
style="border-collapse: collapse; border-spacing: 0; width: 100%;" data-page-length='13'>
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width: 5%;">№</th>
|
||||
|
||||
<th>Tapgyr Kody</th>
|
||||
<th>Haryt Kody</th>
|
||||
<th>Haryt</th>
|
||||
<th>Ýüklenen Mukdary</th>
|
||||
<th>Bellik</th>
|
||||
<th>Sazlamalar</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="transport_item_datas">
|
||||
{% for key, loadedItem in loadedItems %}
|
||||
|
||||
<tr>
|
||||
<td>{{key+1}}</td>
|
||||
<td>#{{loadedItem.id}}</td>
|
||||
<td>#{{loadedItem.order_item_id}}</td>
|
||||
<td>
|
||||
{% if loadedItem.order_item.order_item_type == 'rulon' %}
|
||||
Rulon, Jemi: {{loadedItem.order_item.amount}} kg
|
||||
{% else %}
|
||||
Halta, Jemi: {{loadedItem.order_item.amount}} sany, {{loadedItem.order_item.bag_gram}} gr
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>{{loadedItem.loaded_amount}}</td>
|
||||
<td>{{loadedItem.note}}</td>
|
||||
<td>
|
||||
{% if order.user_id == user.id %}
|
||||
<button data-request="onSetUpdateForm"
|
||||
data-request-data="itemId: {{loadedItem.id}}"
|
||||
data-bs-toggle="modal" data-bs-target=".bs-example-modal-sm-1" type="button" class="btn btn-warning waves-light waves-effect"><i class="fa fa-pen"></i></button>
|
||||
|
||||
<button data-request="onDeleteItem"
|
||||
data-request-confirm="Tapgyr #{{loadedItem.id}} pozmak isleýäňizmi?"
|
||||
data-request-data="itemId: {{loadedItem.id}}"
|
||||
type="button" class="btn btn-danger waves-light waves-effect"><i class="fa fa-trash-alt"></i></button>
|
||||
{% else %}
|
||||
|
||||
<a href="#" style="color: orange;"> Size degişli däl </a>
|
||||
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
{% endfor %}
|
||||
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<th style="width: 5%;">№</th>
|
||||
<th>Tapgyr Kody</th>
|
||||
<th>Haryt Kody</th>
|
||||
<th>Haryt</th>
|
||||
<th>Ýüklenen Mukdary</th>
|
||||
<th>Bellik</th>
|
||||
<th>Sazlamalar</th>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="modal fade bs-example-modal-sm-1" tabindex="-1" role="dialog"
|
||||
aria-labelledby="mySmallModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content" id="modal-form">
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div> <!-- card -->
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<!-- End row -->
|
||||
</div>
|
||||
|
||||
|
||||
{% put scripts %}
|
||||
|
||||
<script>
|
||||
function calculateLoaded(itemId) {
|
||||
$.request('onCalculateLoaded', {
|
||||
data: { 'item_id': itemId },
|
||||
success: function (data) {
|
||||
|
||||
$("#loadedCalc").html(`Ýüklenmeli Mukdar <font style="color: red;"> (jemi ýüklenen: ` + data.loadedSum + `)</font>`);
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
</script>
|
||||
|
||||
<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 %}
|
||||
{% partial 'dataTableJs' %}
|
||||
Loading…
Reference in New Issue