orderitems
This commit is contained in:
parent
3bfaf68222
commit
f45624dd66
|
|
@ -9,6 +9,7 @@ class Plugin extends PluginBase
|
|||
return [
|
||||
'Romanah\Gokbakja\Components\Action' => 'action',
|
||||
'Romanah\Gokbakja\Components\Production' => 'production',
|
||||
'Romanah\Gokbakja\Components\MachineProduction' => 'machineProduction',
|
||||
'Romanah\Gokbakja\Components\Sewer' => 'sewer',
|
||||
'Romanah\Gokbakja\Components\Order' => 'order',
|
||||
];
|
||||
|
|
|
|||
|
|
@ -0,0 +1,130 @@
|
|||
<?php
|
||||
|
||||
namespace Romanah\Gokbakja\Components;
|
||||
|
||||
use Cms\Classes\ComponentBase;
|
||||
use Romanah\Gokbakja\Models\Product as ProductModel;
|
||||
use Romanah\Gokbakja\Models\Production as ProductionModel;
|
||||
use Romanah\Gokbakja\Models\ProductionMachine as ProductionMachineModel;
|
||||
use Romanah\Gokbakja\Models\PivotProduction as PivotProductionModel;
|
||||
use Redirect;
|
||||
use Carbon\Carbon;
|
||||
use Flash;
|
||||
// use Illuminate\Validation\Validator;
|
||||
use \Validator;
|
||||
use DB;
|
||||
|
||||
class MachineProduction extends ComponentBase
|
||||
{
|
||||
|
||||
|
||||
public function componentDetails()
|
||||
{
|
||||
return [
|
||||
'name' => 'Machine Production',
|
||||
'description' => 'Machine productions settings'
|
||||
];
|
||||
}
|
||||
|
||||
|
||||
public function onRender()
|
||||
{
|
||||
|
||||
$html_data = '';
|
||||
|
||||
$currentDateFormat = Carbon::now()->format('Y-m-d');
|
||||
|
||||
$machineProductions = ProductionMachineModel::with(['bag_type', 'bag_size', 'machine.building', 'employee', 'mechanic'])->orderBy('id', 'DESC')->whereDate('created_at', date($currentDateFormat))->get();
|
||||
|
||||
$html_data = '';
|
||||
for ($x = 0; $x < count($machineProductions); $x++) {
|
||||
// dd($machineProductions[0]->bag_size);
|
||||
$html_data .= '<tr>
|
||||
<td style="font-weight: bold;">' . ($x + 1) . '</td>
|
||||
<td><a href="#" style="font-weight: bold;">' . $machineProductions[$x]->building_name . '</a></td>
|
||||
<td>' . $machineProductions[$x]->machine->name . '</td>
|
||||
<td>' . $machineProductions[$x]->bag_size->name . '</td>
|
||||
<td>' . $machineProductions[$x]->bag_type->name . '</td>
|
||||
<td><span class="badge badge-soft-success"
|
||||
style="font-size: 14px;">' . number_format($machineProductions[$x]->produced_weight) . ' kg</span>
|
||||
</td>
|
||||
<td>' . $machineProductions[$x]->employee_name . '</td>
|
||||
<td>' . $machineProductions[$x]->mechanic_name . '</td>
|
||||
<td>' . $machineProductions[$x]->note . '</td>
|
||||
</tr>';
|
||||
}
|
||||
|
||||
return $html_data;
|
||||
}
|
||||
|
||||
|
||||
public function onCreateMachineProduction()
|
||||
{
|
||||
$user = \Auth::user();
|
||||
|
||||
$data = post();
|
||||
|
||||
if (empty($data["produced_weight"]) || $data["type_id"] == 0 || $data["size_id"] == 0 || $data["machine_id"] == 0) {
|
||||
Flash::error("Gutulary Dolduryn!");
|
||||
return [
|
||||
'#validationq' => ' Gutulary Dolduryn!',
|
||||
];
|
||||
|
||||
} else {
|
||||
$createProductionMachine = new ProductionMachineModel();
|
||||
|
||||
$createProductionMachine->type_id = $data["type_id"];
|
||||
$createProductionMachine->size_id = $data["size_id"];
|
||||
$createProductionMachine->machine_id = $data["machine_id"];
|
||||
$createProductionMachine->produced_weight = $data["produced_weight"];
|
||||
$createProductionMachine->note = $data["note"];
|
||||
$createProductionMachine->user_id = $user->id;
|
||||
$createProductionMachine->save();
|
||||
|
||||
$productionMachine = ProductionMachineModel::where('id', $createProductionMachine->id)->with(['machine.employee', 'machine.mechanic', 'machine.building'])->first();
|
||||
// dd($productionMachine->machine->name);
|
||||
if ($productionMachine) {
|
||||
$updateResult = ProductionMachineModel::where('id', $productionMachine->id)
|
||||
->update(array(
|
||||
'employee_id' => $productionMachine->machine->employee->id,
|
||||
'mechanic_id' => $productionMachine->machine->mechanic->id,
|
||||
'employee_name' => $productionMachine->machine->employee->name,
|
||||
'mechanic_name' => $productionMachine->machine->mechanic->name,
|
||||
'building_name' => $productionMachine->machine->building->name,
|
||||
));
|
||||
}
|
||||
|
||||
$currentDateFormat = Carbon::now()->format('Y-m-d');
|
||||
|
||||
$machineProductions = ProductionMachineModel::with(['bag_type', 'bag_size', 'machine.building', 'employee', 'mechanic'])->whereDate('created_at', date($currentDateFormat))->orderBy('id', 'DESC')->get();
|
||||
|
||||
$html_data = '';
|
||||
|
||||
for ($x = 0; $x < count($machineProductions); $x++) {
|
||||
$html_data .= '<tr>
|
||||
<td style="font-weight: bold;">' . ($x + 1) . '</td>
|
||||
<td><a href="#" style="font-weight: bold;">' . $machineProductions[$x]->building_name . '</a></td>
|
||||
<td>' . $machineProductions[$x]->machine->name . '</td>
|
||||
<td>' . $machineProductions[$x]->bag_size->name . '</td>
|
||||
<td>' . $machineProductions[$x]->bag_type->name . '</td>
|
||||
<td><span class="badge badge-soft-success"
|
||||
style="font-size: 14px;">' . number_format($machineProductions[$x]->produced_weight) . ' kg</span>
|
||||
</td>
|
||||
<td>' . $machineProductions[$x]->employee_name . '</td>
|
||||
<td>' . $machineProductions[$x]->mechanic_name . '</td>
|
||||
<td>' . $machineProductions[$x]->note . '</td>
|
||||
</tr>';
|
||||
}
|
||||
|
||||
if ($createProductionMachine && $updateResult) {
|
||||
|
||||
Flash::success("Hasabat Ustunlikli Goşuldy");
|
||||
return [
|
||||
'#machine_datas' => $html_data,
|
||||
];
|
||||
} else {
|
||||
Flash::error("Yalnyshlyk bar!!");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -25,6 +25,7 @@ class Order extends ComponentBase
|
|||
}
|
||||
|
||||
|
||||
|
||||
public function onRender(){
|
||||
|
||||
$html_data = '';
|
||||
|
|
@ -34,22 +35,56 @@ class Order extends ComponentBase
|
|||
for ($x = 0; $x < count($orderDatas); $x++) {
|
||||
$html_data .= '<tr>
|
||||
<td style="font-weight: bold;">'.($x+1).'</td>
|
||||
<td><a href="#" style="font-weight: bold;">'.$orderDatas[$x]->client->name.'</a></td>
|
||||
<td><a href="/order-detail/'.$orderDatas[$x]->id.'" style="font-weight: bold;">Sargyt #'.$orderDatas[$x]->id.'</a></td>
|
||||
<td><a href="/order-detail/'.$orderDatas[$x]->id.'" style="font-weight: bold;">'.$orderDatas[$x]->client->name.'</a></td>
|
||||
<td>'.$orderDatas[$x]->client->country.'</td>
|
||||
<td>'.$orderDatas[$x]->amount.' kg</td>
|
||||
<td>'.number_format($orderDatas[$x]->amount).' kg</td>
|
||||
<td><span class="badge badge-soft-success"
|
||||
style="font-size: 14px;">'.$orderDatas[$x]->price.'</span>
|
||||
style="font-size: 14px;">'.number_format($orderDatas[$x]->price).' $</span>
|
||||
</td>
|
||||
<td><span class="badge badge-soft-primary"
|
||||
style="font-size: 14px;">'.$orderDatas[$x]->shipping->status.'</span>
|
||||
<td><a href="#" class="badge badge-soft-'.($orderDatas[$x]->shipping->status == 'not_loaded' ? 'danger' : 'primary' ).'" style="font-size: 14px;">'.($orderDatas[$x]->shipping->status == 'not_loaded' ? 'Ýüklenmedik' : 'Ýüklenýär' ).'</a>
|
||||
</td>
|
||||
<td>'.$orderDatas[$x]->created_at->format('d.m.Y').'</td>
|
||||
<td>'.$orderDatas[$x]->note.'</td>
|
||||
</tr>';
|
||||
|
||||
}
|
||||
|
||||
|
||||
return $html_data;
|
||||
}
|
||||
|
||||
// data-request="onModalSet" data-request-data="orderId: '.$orderDatas[$x]->id.', header: \''.$orderDatas[$x]->client->name.'\'" data-bs-toggle="modal" data-bs-target=".bs-example-modal-sm-1"
|
||||
|
||||
public function onModalSet(){
|
||||
|
||||
$data = post();
|
||||
|
||||
$html_data = '<div class="modal-header">
|
||||
<h5 class="modal-title" id="mySmallModalLabel">'.$data["header"].'</h5>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal"
|
||||
aria-label="Close"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<form data-request="" method="POST" data-request-flash>
|
||||
<input type="number" step="0.01" pattern="/^-?\d+\.?\d*$/"
|
||||
onKeyPress="if(this.value.length==4) return false;"
|
||||
name="product}" class="form-control"
|
||||
placeholder="%"
|
||||
value="qqqq">
|
||||
|
||||
<button type="submit"
|
||||
class="btn btn-primary waves-effect waves-light"
|
||||
style="margin-top: 15px;width: 100%;">Üýtget</button>
|
||||
</form>
|
||||
</div>';
|
||||
|
||||
return [
|
||||
'#modal-form' => $html_data,
|
||||
];
|
||||
|
||||
}
|
||||
|
||||
|
||||
public function onCreateOrder()
|
||||
{
|
||||
|
|
@ -59,6 +94,9 @@ class Order extends ComponentBase
|
|||
|
||||
$data = post();
|
||||
|
||||
|
||||
|
||||
|
||||
$createOrder = new OrderModel();
|
||||
$createOrder->client_id = $data["client_id"];
|
||||
$createOrder->amount = $data["amount"];
|
||||
|
|
@ -69,7 +107,7 @@ class Order extends ComponentBase
|
|||
|
||||
$createShipping = new ShippingModel();
|
||||
$createShipping->order_id = $createOrder->id;
|
||||
$createShipping->status = 'note_loaded';
|
||||
$createShipping->status = 'not_loaded';
|
||||
$createShipping->employee_id = 0;
|
||||
$createShipping->place_now = "Aşgabat";
|
||||
$createShipping->loaded_amount = 0;
|
||||
|
|
@ -88,17 +126,20 @@ class Order extends ComponentBase
|
|||
// dd($orderDatas[$x]->shipping->status);
|
||||
$html_data .= '<tr>
|
||||
<td style="font-weight: bold;">'.($x+1).'</td>
|
||||
<td><a href="/order-detail/'.$orderDatas[$x]->id.'" style="font-weight: bold;">Sargyt #'.$orderDatas[$x]->id.'</a></td>
|
||||
<td><a href="#" style="font-weight: bold;">'.$orderDatas[$x]->client->name.'</a></td>
|
||||
<td>'.$orderDatas[$x]->client->country.'</td>
|
||||
<td>'.$orderDatas[$x]->amount.' kg</td>
|
||||
<td>'.number_format($orderDatas[$x]->amount).' kg</td>
|
||||
<td><span class="badge badge-soft-success"
|
||||
style="font-size: 14px;">'.$orderDatas[$x]->price.'</span>
|
||||
style="font-size: 14px;">'.number_format($orderDatas[$x]->price).' $</span>
|
||||
</td>
|
||||
<td><span class="badge badge-soft-primary"
|
||||
style="font-size: 14px;">'.$orderDatas[$x]->shipping->status.'</span>
|
||||
<td><a href="#" class="badge badge-soft-'.($orderDatas[$x]->shipping->status == 'not_loaded' ? 'danger' : 'primary' ).'" style="font-size: 14px;">'.($orderDatas[$x]->shipping->status == 'not_loaded' ? 'Ýüklenmedik' : 'Ýüklenýär' ).'</a>
|
||||
</td>
|
||||
<td>'.$orderDatas[$x]->created_at->format('d.m.Y').'</td>
|
||||
<td>'.$orderDatas[$x]->note.'</td>
|
||||
</tr>';
|
||||
|
||||
|
||||
}
|
||||
|
||||
if($createOrder){
|
||||
|
|
|
|||
|
|
@ -99,40 +99,6 @@ class Production extends ComponentBase
|
|||
}
|
||||
|
||||
|
||||
public function onCreateMachineProduction()
|
||||
{
|
||||
$user = \Auth::user();
|
||||
|
||||
$data = post();
|
||||
|
||||
$createProductionMachine = new ProductionMachineModel();
|
||||
|
||||
$createProductionMachine->type_id = $data["type_id"];
|
||||
$createProductionMachine->size_id = $data["size_id"];
|
||||
$createProductionMachine->machine_id = $data["machine_id"];
|
||||
$createProductionMachine->produced_weight = $data["produced_weight"];
|
||||
$createProductionMachine->note = $data["note"];
|
||||
$createProductionMachine->user_id = $user->id;
|
||||
$createProductionMachine->save();
|
||||
|
||||
$productionMachine = ProductionMachineModel::where('id', $createProductionMachine->id)->with(['machine.employee', 'machine.mechanic', 'machine.building'])->first();
|
||||
// dd($productionMachine->machine->name);
|
||||
if ($productionMachine) {
|
||||
$updateResult = ProductionMachineModel::where('id', $productionMachine->id)
|
||||
->update(array(
|
||||
'employee_id' => $productionMachine->machine->employee->id,
|
||||
'mechanic_id' => $productionMachine->machine->mechanic->id,
|
||||
'employee_name' => $productionMachine->machine->employee->name,
|
||||
'mechanic_name' => $productionMachine->machine->mechanic->name,
|
||||
'building_name' => $productionMachine->machine->building->name,
|
||||
));
|
||||
}
|
||||
|
||||
if ($createProductionMachine && $updateResult) {
|
||||
Flash::success("Hasabat Ustunlikli Goşuldy");
|
||||
return Redirect::refresh();
|
||||
}
|
||||
}
|
||||
|
||||
function onCalculateAvg()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,7 +21,15 @@ class OrderItem extends Model
|
|||
'product' => [
|
||||
'Romanah\Gokbakja\Models\Product',
|
||||
'key' => 'product_id'
|
||||
]
|
||||
],
|
||||
'size' => [
|
||||
'Romanah\Gokbakja\Models\BagSize',
|
||||
'key' => 'size_id'
|
||||
],
|
||||
'type' => [
|
||||
'Romanah\Gokbakja\Models\BagType',
|
||||
'key' => 'type_id'
|
||||
],
|
||||
];
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -13,3 +13,15 @@ fields:
|
|||
label: Note
|
||||
span: auto
|
||||
type: textarea
|
||||
size:
|
||||
label: Razmeri
|
||||
nameFrom: name
|
||||
descriptionFrom: description
|
||||
span: auto
|
||||
type: relation
|
||||
type:
|
||||
label: Gornushi
|
||||
span: auto
|
||||
nameFrom: name
|
||||
descriptionFrom: description
|
||||
type: relation
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
<?php namespace Romanah\Gokbakja\Updates;
|
||||
|
||||
use Schema;
|
||||
use October\Rain\Database\Updates\Migration;
|
||||
|
||||
class BuilderTableUpdateRomanahGokbakjaOrderItem3 extends Migration
|
||||
{
|
||||
public function up()
|
||||
{
|
||||
Schema::table('romanah_gokbakja_order_item', function($table)
|
||||
{
|
||||
$table->integer('type_id');
|
||||
$table->integer('size_id');
|
||||
$table->integer('product_id')->default(0)->change();
|
||||
});
|
||||
}
|
||||
|
||||
public function down()
|
||||
{
|
||||
Schema::table('romanah_gokbakja_order_item', function($table)
|
||||
{
|
||||
$table->dropColumn('type_id');
|
||||
$table->dropColumn('size_id');
|
||||
$table->integer('product_id')->default(null)->change();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
<?php namespace Romanah\Gokbakja\Updates;
|
||||
|
||||
use Schema;
|
||||
use October\Rain\Database\Updates\Migration;
|
||||
|
||||
class BuilderTableUpdateRomanahGokbakjaOrderItem4 extends Migration
|
||||
{
|
||||
public function up()
|
||||
{
|
||||
Schema::table('romanah_gokbakja_order_item', function($table)
|
||||
{
|
||||
$table->double('price', 10, 0)->default(0);
|
||||
});
|
||||
}
|
||||
|
||||
public function down()
|
||||
{
|
||||
Schema::table('romanah_gokbakja_order_item', function($table)
|
||||
{
|
||||
$table->dropColumn('price');
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -174,3 +174,9 @@
|
|||
1.0.59:
|
||||
- 'Updated table romanah_gokbakja_order'
|
||||
- builder_table_update_romanah_gokbakja_order_4.php
|
||||
1.0.60:
|
||||
- 'Updated table romanah_gokbakja_order_item'
|
||||
- builder_table_update_romanah_gokbakja_order_item_3.php
|
||||
1.0.61:
|
||||
- 'Updated table romanah_gokbakja_order_item'
|
||||
- builder_table_update_romanah_gokbakja_order_item_4.php
|
||||
|
|
|
|||
|
|
@ -1,87 +1,84 @@
|
|||
[session]
|
||||
security = "all"
|
||||
redirect = "home"
|
||||
|
||||
[staticMenu]
|
||||
code = "aside"
|
||||
|
||||
[session]
|
||||
security = "all"
|
||||
redirect = "dashboard"
|
||||
|
||||
[account]
|
||||
redirect = "home"
|
||||
paramCode = "code"
|
||||
forceSecure = 0
|
||||
requirePassword = 0
|
||||
==
|
||||
<?php
|
||||
function onStart()
|
||||
{
|
||||
$link = $this->page["url"];
|
||||
function onStart(){
|
||||
|
||||
$link = $this->page["url"];
|
||||
|
||||
}
|
||||
?>
|
||||
==
|
||||
<!doctype html>
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<title>GOKBAKJA | {{ this.page.title }}</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<meta content="Gokbakja" name="description" />
|
||||
<!-- App favicon -->
|
||||
<link rel="shortcut icon" href="{{'assets/images/fav_green.png'|theme}}" />
|
||||
|
||||
<head>
|
||||
{% styles %}
|
||||
<!-- jquery.vectormap css -->
|
||||
<!-- <link href="{{'assets/libs/admin-resources/jquery.vectormap/jquery-jvectormap-1.2.2.css'|theme}}" rel="stylesheet" type="text/css" /> -->
|
||||
|
||||
<meta charset="utf-8" />
|
||||
<title>GOKBAKJA | {{ this.page.title }}</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta content="Gokbakja" name="description" />
|
||||
<!-- App favicon -->
|
||||
<link rel="shortcut icon" href="{{'assets/images/fav_green.png'|theme}}">
|
||||
<!-- Bootstrap Css -->
|
||||
<link
|
||||
href="{{'assets/css/bootstrap.min.css'|theme}}"
|
||||
id="bootstrap-style"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<!-- Icons Css -->
|
||||
<link href="{{'assets/css/icons.min.css'|theme}}" rel="stylesheet" type="text/css" />
|
||||
<!-- App Css-->
|
||||
<link
|
||||
href="{{'assets/css/app.min.css'|theme}}"
|
||||
id="app-style"
|
||||
rel="stylesheet"
|
||||
type="text/css"
|
||||
/>
|
||||
<style>
|
||||
th {
|
||||
text-align: center !important;
|
||||
}
|
||||
|
||||
{% styles %}
|
||||
<!-- jquery.vectormap css -->
|
||||
<!-- <link href="{{'assets/libs/admin-resources/jquery.vectormap/jquery-jvectormap-1.2.2.css'|theme}}" rel="stylesheet" type="text/css" /> -->
|
||||
td {
|
||||
text-align: center !important;
|
||||
vertical-align: middle !important;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<!-- Bootstrap Css -->
|
||||
<link href="{{'assets/css/bootstrap.min.css'|theme}}" id="bootstrap-style" rel="stylesheet" type="text/css" />
|
||||
<!-- Icons Css -->
|
||||
<link href="{{'assets/css/icons.min.css'|theme}}" rel="stylesheet" type="text/css" />
|
||||
<!-- App Css-->
|
||||
<link href="{{'assets/css/app.min.css'|theme}}" id="app-style" rel="stylesheet" type="text/css" />
|
||||
<style>
|
||||
th {
|
||||
text-align: center !important;
|
||||
}
|
||||
<body data-topbar="dark">
|
||||
{% flash %}
|
||||
<p data-control="flash-message" class="flash-message fade {{ type }}" data-interval="5">
|
||||
{{ message }}
|
||||
</p>
|
||||
{% endflash %} {% if user %} {% partial 'layout-settings-main' %} {% else %} {% partial
|
||||
'login-page' %} {% endif %}
|
||||
|
||||
td {
|
||||
text-align: center !important;
|
||||
vertical-align: middle !important;
|
||||
}
|
||||
<!-- JAVASCRIPT -->
|
||||
<script src="{{'assets/libs/jquery/jquery.min.js'|theme}}"></script>
|
||||
<script src="{{'assets/libs/bootstrap/js/bootstrap.bundle.min.js'|theme}}"></script>
|
||||
<script src="{{'assets/libs/metismenu/metisMenu.min.js'|theme}}"></script>
|
||||
<script src="{{'assets/libs/simplebar/simplebar.min.js'|theme}}"></script>
|
||||
<script src="{{'assets/libs/node-waves/waves.min.js'|theme}}"></script>
|
||||
|
||||
</style>
|
||||
</head>
|
||||
|
||||
<body data-topbar="dark">
|
||||
{% flash %}
|
||||
<p
|
||||
data-control="flash-message"
|
||||
class="flash-message fade {{ type }}"
|
||||
data-interval="5">
|
||||
{{ message }}
|
||||
</p>
|
||||
{% endflash %}
|
||||
|
||||
{% if user %}
|
||||
{% partial 'layout-settings-main' %}
|
||||
{% else %}
|
||||
{% partial 'login-page' %}
|
||||
{% endif %}
|
||||
|
||||
<!-- JAVASCRIPT -->
|
||||
<script src="{{'assets/libs/jquery/jquery.min.js'|theme}}"></script>
|
||||
<script src="{{'assets/libs/bootstrap/js/bootstrap.bundle.min.js'|theme}}"></script>
|
||||
<script src="{{'assets/libs/metismenu/metisMenu.min.js'|theme}}"></script>
|
||||
<script src="{{'assets/libs/simplebar/simplebar.min.js'|theme}}"></script>
|
||||
<script src="{{'assets/libs/node-waves/waves.min.js'|theme}}"></script>
|
||||
|
||||
|
||||
{% scripts %}
|
||||
<!-- App js -->
|
||||
<script src="{{'assets/js/app.js'|theme}}"></script>
|
||||
{% framework extras %}
|
||||
|
||||
</body>
|
||||
|
||||
|
||||
</html>
|
||||
{% scripts %}
|
||||
<!-- App js -->
|
||||
<script src="{{'assets/js/app.js'|theme}}"></script>
|
||||
{% framework extras %}
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -43,22 +43,9 @@ detailsPage = "-"
|
|||
detailsUrlParameter = "id"
|
||||
pageNumber = "{{ :page }}"
|
||||
|
||||
[production]
|
||||
[machineProduction]
|
||||
==
|
||||
<?php
|
||||
function onStart(){
|
||||
$currentDate = Carbon\Carbon::now()->timezone('UTC +05:00');
|
||||
|
||||
$currentDateFormat = Carbon\Carbon::now()->format('Y-m-d');
|
||||
|
||||
$this["currentDate"] = $currentDate;
|
||||
$this["currentMonth"] = $currentDate->format('m');
|
||||
$this["currentYear"] = $currentDate->format('Y');
|
||||
|
||||
$this["machineProductions"] = Romanah\Gokbakja\Models\ProductionMachine::with(['bag_type', 'bag_size', 'machine.building', 'employee', 'mechanic'])->whereDate('created_at', date($currentDateFormat))->get();
|
||||
}
|
||||
?>
|
||||
==
|
||||
{% set records = builderList.records %}
|
||||
{% set displayColumn = builderList.displayColumn %}
|
||||
{% set noRecordsMessage = builderList.noRecordsMessage %}
|
||||
|
|
@ -67,8 +54,8 @@ function onStart(){
|
|||
{% set detailsUrlParameter = builderList.detailsUrlParameter %}
|
||||
|
||||
{% set machines = builderList2.records %}
|
||||
{% set types = builderList3.records %}
|
||||
{% set sizes = builderList4.records %}
|
||||
{% set types = builderList4.records %}
|
||||
{% set sizes = builderList3.records %}
|
||||
|
||||
{% put styles %}
|
||||
<link href="{{'assets/libs/datatables.net-bs4/css/dataTables.bootstrap4.min.css'|theme}}" rel="stylesheet"
|
||||
|
|
@ -89,11 +76,11 @@ function onStart(){
|
|||
<div class="collapse multi-collapse" id="multiCollapseExample1">
|
||||
<div class="card card-body">
|
||||
|
||||
<form data-request="onCreateMachineProduction">
|
||||
<form data-request="onCreateMachineProduction" data-request-flash>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<select class="form-control select2" name="machine_id">
|
||||
<option>Enjam Saýla</option>
|
||||
<option value="0">Enjam Saýla</option>
|
||||
{% for machine in machines %}
|
||||
<option value="{{machine.id}}">{{machine.name}}</option>
|
||||
{% endfor %}
|
||||
|
|
@ -101,7 +88,7 @@ function onStart(){
|
|||
</div>
|
||||
<div class="col">
|
||||
<select class="form-control select2" name="size_id">
|
||||
<option>Ölçeg Saýla</option>
|
||||
<option value="0">Ölçeg Saýla</option>
|
||||
{% for size in sizes %}
|
||||
<option value="{{size.id}}">{{size.name}}</option>
|
||||
{% endfor %}
|
||||
|
|
@ -109,7 +96,7 @@ function onStart(){
|
|||
</div>
|
||||
<div class="col">
|
||||
<select class="form-control select2" name="type_id">
|
||||
<option>Görnüş Saýla</option>
|
||||
<option value="0">Görnüş Saýla</option>
|
||||
{% for type in types %}
|
||||
<option value="{{type.id}}">{{type.name}}</option>
|
||||
{% endfor %}
|
||||
|
|
@ -137,8 +124,9 @@ function onStart(){
|
|||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<h3 class="card-title" style="font-size: 22px;color: #1e2038;">Enjamlar boýunça
|
||||
({{currentDate|date('d.m.Y | H:i')}})</h3>
|
||||
({{currentDate|date('d.m.Y | H:i')}}) <font id="validationq" style="color: darkred;font-size: 17px;"></font></h3>
|
||||
<p class="card-title-desc" style="color: #6c6ff5;">Hasabat</p>
|
||||
|
||||
</div>
|
||||
<div class="col-md-6" style="text-align: right;">
|
||||
<a class="btn btn-primary" data-bs-toggle="collapse" href="#multiCollapseExample1"
|
||||
|
|
@ -167,24 +155,8 @@ function onStart(){
|
|||
<!-- <th>Настройки</th> -->
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
||||
{% for key, machine in machineProductions %}
|
||||
<tr>
|
||||
<td style="font-weight: bold;">{{key + 1}}</td>
|
||||
<td><a href="#" style="font-weight: bold;">{{machine.building_name}}</a></td>
|
||||
<td>{{machine.machine.name}}</td>
|
||||
<td>{{machine.bag_size.name}}</td>
|
||||
<td>{{machine.bag_type.name}}</td>
|
||||
<td><span class="badge badge-soft-success"
|
||||
style="font-size: 14px;">{{machine.produced_weight|number_format}} kg</span>
|
||||
</td>
|
||||
<td>{{machine.employee_name}}</td>
|
||||
<td>{{machine.mechanic_name}}</td>
|
||||
<td>{{machine.note}}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
||||
<tbody id="machine_datas">
|
||||
{% component 'machineProduction' %}
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ function onStart(){
|
|||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<div class="collapse multi-collapse" id="multiCollapseExample1">
|
||||
<form data-request="onCreateOrder" data-request-flash>
|
||||
<form data-request="onCreateOrder" data-request-flash data-request-validate>
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
|
|
@ -41,13 +41,14 @@ function onStart(){
|
|||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col">
|
||||
<!-- <div class="col">
|
||||
<div>
|
||||
<label class="form-label">Mukdary (kg)</label>
|
||||
<input type="number" name="amount" step="0.01" class="form-control"
|
||||
placeholder="Sargyt edilen halta kg-da">
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
<input type="hidden" name="amount" value="0">
|
||||
<div class="col">
|
||||
<div>
|
||||
<label class="form-label">Bahasy</label>
|
||||
|
|
@ -99,11 +100,13 @@ function onStart(){
|
|||
<thead>
|
||||
<tr>
|
||||
<th style="width: 5%;">№</th>
|
||||
<th>Sargyt No</th>
|
||||
<th>Klent</th>
|
||||
<th>Ýurdy</th>
|
||||
<th>Mukdary</th>
|
||||
<th>Bahasy</th>
|
||||
<th>Logistika</th>
|
||||
<th>Senesi</th>
|
||||
<th>Bellik</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
@ -113,27 +116,40 @@ function onStart(){
|
|||
<tfoot>
|
||||
<tr>
|
||||
<th style="width: 5%;">№</th>
|
||||
<th>Sargyt No</th>
|
||||
<th>Klent</th>
|
||||
<th>Ýurdy</th>
|
||||
<th>Mukdary</th>
|
||||
<th>Bahasy</th>
|
||||
<th>Logistika</th>
|
||||
<th>Senesi</th>
|
||||
<th>Bellik</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 modal-sm">
|
||||
<div class="modal-content" id="modal-form">
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% put scripts %}
|
||||
|
||||
<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' %}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,253 @@
|
|||
title = "Order detail"
|
||||
url = "/order-detail/:orderId"
|
||||
layout = "platform_main"
|
||||
is_hidden = 0
|
||||
|
||||
[order]
|
||||
==
|
||||
<?php
|
||||
function onStart(){
|
||||
|
||||
$orderId = $this->param("orderId");
|
||||
$this["order"] = Romanah\Gokbakja\Models\Order::where("id", $orderId)->with(["client", "shipping"])->first();
|
||||
$this["sizes"] = Romanah\Gokbakja\Models\BagSize::get();
|
||||
$this["types"] = Romanah\Gokbakja\Models\BagType::get();
|
||||
|
||||
}
|
||||
?>
|
||||
==
|
||||
{% 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">Sargyt Maglumatlary</h4>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- end page title -->
|
||||
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<!-- Left sidebar -->
|
||||
<div class="email-leftbar card">
|
||||
<a href="/orders/new" type="button" class="btn btn-danger waves-effect waves-light">
|
||||
Yza
|
||||
</a>
|
||||
<div class="mail-list mt-4">
|
||||
<a href="/all-production-month/1" class="active"><i class="mdi mdi-cart me-2 font-size-16"></i>
|
||||
Sargyt Maglumatlary</a>
|
||||
<a href="/all-production-month/1" class=""><i class="mdi mdi-truck me-2 font-size-16"></i> Logistika
|
||||
Maglumatlary</a>
|
||||
<a href="/all-production-month/1" class=""><i class="mdi mdi-id-card me-2 font-size-16"></i>
|
||||
Tölegler</a>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</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="onCreateOrderItem" data-request-flash data-request-validate>
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<label class="form-label">Razmer Saýlaň</label>
|
||||
<select class="form-control select2" name="size_id">
|
||||
<option value="0">Saýla</option>
|
||||
{% for size in sizes %}
|
||||
<option value="{{size.id}}">{{size.name}}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
<div class="col">
|
||||
<label class="form-label">Görnüş Saýlaň</label>
|
||||
<select class="form-control select2" name="type_id">
|
||||
<option value="0">Saýla</option>
|
||||
{% for type in types %}
|
||||
<option value="{{type.id}}">{{type.name}}</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="col">
|
||||
<div>
|
||||
<label class="form-label">Bahasy</label>
|
||||
<input type="number" name="price" step="0.01" class="form-control"
|
||||
placeholder="Bahasy">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col">
|
||||
<div>
|
||||
<label class="form-label">Mukdary (kg)</label>
|
||||
<input type="number" name="amount" step="0.01" class="form-control"
|
||||
placeholder="Mukdary">
|
||||
</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="row">
|
||||
<div class="col-lg-12">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
<div class="col-md-4">
|
||||
<div class="d-flex">
|
||||
<div class="avatar-sm me-3">
|
||||
<span
|
||||
class="avatar-title bg-light rounded-circle text-primary font-size-24">
|
||||
<i class="ri-checkbox-circle-line"></i>
|
||||
</span>
|
||||
</div>
|
||||
<div class="flex-grow-1 align-self-center overflow-hidden">
|
||||
<h5>Sargyt #{{order.id}}</h5>
|
||||
<p class="text-muted mb-0">Sargyt No</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="d-flex mt-4 mt-md-0">
|
||||
<div class="avatar-sm me-3">
|
||||
<span
|
||||
class="avatar-title bg-light rounded-circle text-primary font-size-24">
|
||||
<i class="ri-user-3-line"></i>
|
||||
</span>
|
||||
</div>
|
||||
<div class="flex-grow-1 align-self-center overflow-hidden">
|
||||
<h5>{{order.client.name}}</h5>
|
||||
<p class="text-muted mb-0">Sargyt ediji</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="d-flex mt-4 mt-md-0">
|
||||
<div class="avatar-sm me-3">
|
||||
<span
|
||||
class="avatar-title bg-light rounded-circle text-primary font-size-24">
|
||||
<i class="ri-money-dollar-circle-line"></i>
|
||||
</span>
|
||||
</div>
|
||||
<div class="flex-grow-1 align-self-center overflow-hidden">
|
||||
<h5>{{order.price}} $</h5>
|
||||
<p class="text-muted mb-0">Umumy Bahasy</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
|
||||
<div class="card-body">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<h3 class="card-title" style="font-size: 22px;color: #1e2038;">Sargytlar</h3>
|
||||
<p class="card-title-desc" style="color: #6c6ff5;">Hasabat</p>
|
||||
</div>
|
||||
<div class="col-md-6" style="text-align: right;">
|
||||
<a class="btn btn-primary" data-bs-toggle="collapse" href="#multiCollapseExample1"
|
||||
role="button" aria-expanded="false" aria-controls="multiCollapseExample1">Haryt Goş</a>
|
||||
</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>Sargyt No</th>
|
||||
<th>Klent</th>
|
||||
<th>Ýurdy</th>
|
||||
<th>Mukdary</th>
|
||||
<th>Bahasy</th>
|
||||
<th>Logistika</th>
|
||||
<th>Senesi</th>
|
||||
<th>Bellik</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody id="order_datas">
|
||||
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<th style="width: 5%;">№</th>
|
||||
<th>Sargyt No</th>
|
||||
<th>Klent</th>
|
||||
<th>Ýurdy</th>
|
||||
<th>Mukdary</th>
|
||||
<th>Bahasy</th>
|
||||
<th>Logistika</th>
|
||||
<th>Senesi</th>
|
||||
<th>Bellik</th>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
|
||||
</div>
|
||||
|
||||
</div> <!-- card -->
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<!-- End row -->
|
||||
</div>
|
||||
|
||||
|
||||
{% put scripts %}
|
||||
|
||||
<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' %}
|
||||
|
|
@ -240,6 +240,8 @@ function onStart(){
|
|||
|
||||
|
||||
{% endfor %}
|
||||
|
||||
|
||||
|
||||
</tbody>
|
||||
<tfoot>
|
||||
|
|
@ -356,4 +358,4 @@ function onStart(){
|
|||
|
||||
</script>
|
||||
|
||||
{% endput %}
|
||||
{% endput %}
|
||||
Loading…
Reference in New Issue