admin panel temp settings

plugins/romanah/gokbakja/components/Action.php

@@ -32,6 +32,11 @@ class Action extends ComponentBase
             $createResult = new ActionModel();
             $createResult->product_id = $data["product_id"];
             $createResult->type = 'inbox';
+            $createResult->status_accountant = "new";
+            $createResult->status_director = "new";
+            $createResult->transport_no = $data["transport_no"];
+            $createResult->driver = $data["driver"];
+            $createResult->note = $data["note"];
             $createResult->amount = $data["quantity"];
             $createResult->stock_id = $data["stock_id"];
             $createResult->user_id = $user->id;
@@ -89,6 +94,9 @@ class Action extends ComponentBase
                 'product_id' => $data["product_id"],
                 'amount' => $data["quantity"],
                 'stock_id' => $data["stock_id"],
+                'note' => $data["note"],
+                'transport_no' => $data["transport_no"],
+                'driver' => $data["driver"],
                 'user_id' => $user->id,
             ));
         // $createResult = DollorModel::create([]);

plugins/romanah/gokbakja/components/Production.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace Romanah\Gokbakja\Components;
+
+use Cms\Classes\ComponentBase;
+use Romanah\Gokbakja\Models\Production as ProductionModel;
+use Romanah\Gokbakja\Models\PivotProduction as PivotProductionModel;
+use Redirect;
+use Flash;
+
+class Production extends ComponentBase
+{
+
+
+    public function componentDetails()
+    {
+        return [
+            'name'        => 'Production',
+            'description' => 'productions settings'
+        ];
+    }
+
+
+    public function onCreateProduction()
+    {
+        $user = \Auth::user();
+
+        $data = post();
+
+    }
+
+    public function onUpdateProduction()
+    {
+        $user = \Auth::user();
+        $data = post();
+
+        $updateResult = ActionModel::where('id', $data["id"])
+            ->update(array(
+                'product_id' => $data["product_id"],
+                'amount' => $data["quantity"],
+                'stock_id' => $data["stock_id"],
+                'note' => $data["note"],
+                'transport_no' => $data["transport_no"],
+                'driver' => $data["driver"],
+                'user_id' => $user->id,
+            ));
+        // $createResult = DollorModel::create([]);
+
+        // dd($data);
+        if ($updateResult) {
+            Flash::success("Action Ustunlikli Uytgedildi");
+            return Redirect::refresh();
+        }
+    }
+
+
+    public function onGetProduction()
+    {
+        $id = post('id');
+        return ActionModel::where('id', $id)->first();
+    }
+
+    // public function onDeleteProduction()
+    // {
+    //     $id = post('id');
+
+    //     $item = ActionModel::Find($id);
+    //     $item->delete();
+
+    //     if ($item) {
+    //         Flash::success("Action Ustunlikli Pozuldy");
+    //         return Redirect::refresh();
+    //     }
+    // }
+
+
+}

plugins/romanah/gokbakja/models/Product.php

@@ -22,6 +22,11 @@ class Product extends Model
         ]
     ];
 
+    public function scopeGetReport($query)
+    {
+        return $query->where('report', 'simple');
+    }
+
     /**
      * @var array Validation rules
      */

plugins/romanah/gokbakja/models/Production.php

@@ -13,21 +13,15 @@ class Production extends Model
 
     protected $dates = ['deleted_at'];
 
-    // public $belongsToMany = [
-    //     'pivot_production' => [
-    //         'Romanah\Gokbakja\Models\PivotProduction',
-    //         'table' => 'romanah_gokbakja_pivot_production',
-    //         'key' => 'production_id'
-    //         // 'order' => 'name'
-    //     ]
-    // ];
-
     public $hasMany = [
         'pivot_production' => [
             'Romanah\Gokbakja\Models\PivotProduction',
             'key' => 'production_id'
         ]
     ];
+
+
+
     /**
      * @var string The database table used by the model.
      */

plugins/romanah/gokbakja/models/pivotproduction/fields.yaml

@@ -1,5 +1,5 @@
 fields:
-    amount:
+    amount_percentage:
         label: Amount
         span: auto
         type: number
@@ -23,3 +23,8 @@ fields:
         descriptionFrom: description
         span: auto
         type: relation
+    date_time:
+        label: 'Wagty we senesi'
+        mode: datetime
+        span: auto
+        type: datepicker

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

@@ -17,3 +17,6 @@ columns:
         type: text
         searchable: true
         sortable: true
+    report:
+        label: Hasabat
+        type: text

plugins/romanah/gokbakja/models/product/fields.yaml

@@ -12,3 +12,11 @@ fields:
         label: Note
         span: auto
         type: textarea
+    report:
+        label: 'Hasabat Görnüş'
+        options:
+            simple: 'Çig mal'
+            not: 'Hasabatda Ýok'
+        span: auto
+        default: simple
+        type: balloon-selector

plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_action_2.php

@@ -0,0 +1,25 @@
+<?php namespace Romanah\Gokbakja\Updates;
+
+use Schema;
+use October\Rain\Database\Updates\Migration;
+
+class BuilderTableUpdateRomanahGokbakjaAction2 extends Migration
+{
+    public function up()
+    {
+        Schema::table('romanah_gokbakja_action', function($table)
+        {
+            $table->string('status_accountant', 191)->nullable(false)->default('new')->change();
+            $table->string('status_director', 191)->nullable(false)->default('new')->change();
+        });
+    }
+    
+    public function down()
+    {
+        Schema::table('romanah_gokbakja_action', function($table)
+        {
+            $table->string('status_accountant', 191)->nullable()->default(null)->change();
+            $table->string('status_director', 191)->nullable()->default(null)->change();
+        });
+    }
+}

plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_pivot_production.php

@@ -0,0 +1,23 @@
+<?php namespace Romanah\Gokbakja\Updates;
+
+use Schema;
+use October\Rain\Database\Updates\Migration;
+
+class BuilderTableUpdateRomanahGokbakjaPivotProduction extends Migration
+{
+    public function up()
+    {
+        Schema::table('romanah_gokbakja_pivot_production', function($table)
+        {
+            $table->time('time');
+        });
+    }
+    
+    public function down()
+    {
+        Schema::table('romanah_gokbakja_pivot_production', function($table)
+        {
+            $table->dropColumn('time');
+        });
+    }
+}

plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_pivot_production_2.php

@@ -0,0 +1,25 @@
+<?php namespace Romanah\Gokbakja\Updates;
+
+use Schema;
+use October\Rain\Database\Updates\Migration;
+
+class BuilderTableUpdateRomanahGokbakjaPivotProduction2 extends Migration
+{
+    public function up()
+    {
+        Schema::table('romanah_gokbakja_pivot_production', function($table)
+        {
+            $table->dateTime('date_time')->nullable();
+            $table->dropColumn('time');
+        });
+    }
+    
+    public function down()
+    {
+        Schema::table('romanah_gokbakja_pivot_production', function($table)
+        {
+            $table->dropColumn('date_time');
+            $table->time('time');
+        });
+    }
+}

plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_pivot_production_3.php

@@ -0,0 +1,25 @@
+<?php namespace Romanah\Gokbakja\Updates;
+
+use Schema;
+use October\Rain\Database\Updates\Migration;
+
+class BuilderTableUpdateRomanahGokbakjaPivotProduction3 extends Migration
+{
+    public function up()
+    {
+        Schema::table('romanah_gokbakja_pivot_production', function($table)
+        {
+            $table->decimal('amout', 10, 0)->nullable();
+            $table->renameColumn('amount', 'amount_percentage');
+        });
+    }
+    
+    public function down()
+    {
+        Schema::table('romanah_gokbakja_pivot_production', function($table)
+        {
+            $table->dropColumn('amout');
+            $table->renameColumn('amount_percentage', 'amount');
+        });
+    }
+}

plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_product.php

@@ -0,0 +1,23 @@
+<?php namespace Romanah\Gokbakja\Updates;
+
+use Schema;
+use October\Rain\Database\Updates\Migration;
+
+class BuilderTableUpdateRomanahGokbakjaProduct extends Migration
+{
+    public function up()
+    {
+        Schema::table('romanah_gokbakja_product', function($table)
+        {
+            $table->string('report')->nullable();
+        });
+    }
+    
+    public function down()
+    {
+        Schema::table('romanah_gokbakja_product', function($table)
+        {
+            $table->dropColumn('report');
+        });
+    }
+}

plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_product_2.php

@@ -0,0 +1,23 @@
+<?php namespace Romanah\Gokbakja\Updates;
+
+use Schema;
+use October\Rain\Database\Updates\Migration;
+
+class BuilderTableUpdateRomanahGokbakjaProduct2 extends Migration
+{
+    public function up()
+    {
+        Schema::table('romanah_gokbakja_product', function($table)
+        {
+            $table->string('report', 191)->default('simple')->change();
+        });
+    }
+    
+    public function down()
+    {
+        Schema::table('romanah_gokbakja_product', function($table)
+        {
+            $table->string('report', 191)->default(null)->change();
+        });
+    }
+}

plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production.php

@@ -0,0 +1,23 @@
+<?php namespace Romanah\Gokbakja\Updates;
+
+use Schema;
+use October\Rain\Database\Updates\Migration;
+
+class BuilderTableUpdateRomanahGokbakjaProduction extends Migration
+{
+    public function up()
+    {
+        Schema::table('romanah_gokbakja_production', function($table)
+        {
+            $table->integer('update_count')->default(10);
+        });
+    }
+    
+    public function down()
+    {
+        Schema::table('romanah_gokbakja_production', function($table)
+        {
+            $table->dropColumn('update_count');
+        });
+    }
+}

plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_2.php

@@ -0,0 +1,23 @@
+<?php namespace Romanah\Gokbakja\Updates;
+
+use Schema;
+use October\Rain\Database\Updates\Migration;
+
+class BuilderTableUpdateRomanahGokbakjaProduction2 extends Migration
+{
+    public function up()
+    {
+        Schema::table('romanah_gokbakja_production', function($table)
+        {
+            $table->dropColumn('update_count');
+        });
+    }
+    
+    public function down()
+    {
+        Schema::table('romanah_gokbakja_production', function($table)
+        {
+            $table->integer('update_count')->default(10);
+        });
+    }
+}

plugins/romanah/gokbakja/updates/version.yaml

@@ -69,3 +69,27 @@
 1.0.24:
     - 'Updated table romanah_gokbakja_production_machine'
     - builder_table_update_romanah_gokbakja_production_machine.php
+1.0.25:
+    - 'Updated table romanah_gokbakja_action'
+    - builder_table_update_romanah_gokbakja_action_2.php
+1.0.26:
+    - 'Updated table romanah_gokbakja_product'
+    - builder_table_update_romanah_gokbakja_product.php
+1.0.27:
+    - 'Updated table romanah_gokbakja_product'
+    - builder_table_update_romanah_gokbakja_product_2.php
+1.0.28:
+    - 'Updated table romanah_gokbakja_pivot_production'
+    - builder_table_update_romanah_gokbakja_pivot_production.php
+1.0.29:
+    - 'Updated table romanah_gokbakja_pivot_production'
+    - builder_table_update_romanah_gokbakja_pivot_production_2.php
+1.0.30:
+    - 'Updated table romanah_gokbakja_production'
+    - builder_table_update_romanah_gokbakja_production.php
+1.0.31:
+    - 'Updated table romanah_gokbakja_production'
+    - builder_table_update_romanah_gokbakja_production_2.php
+1.0.32:
+    - 'Updated table romanah_gokbakja_pivot_production'
+    - builder_table_update_romanah_gokbakja_pivot_production_3.php

themes/gokbakja/meta/menus/aside.yaml

@@ -14,18 +14,26 @@ items:
             isExternal: '0'
     -
         title: Skladlar
+        nesting: null
         type: cms-page
+        url: null
         code: ''
         reference: stocks
+        cmsPage: null
+        replace: null
         viewBag:
             isHidden: '0'
             cssClass: ri-store-2-line
             isExternal: '0'
     -
         title: 'Sklad Hereketleri'
+        nesting: null
         type: url
         url: '#a'
         code: ''
+        reference: null
+        cmsPage: null
+        replace: null
         viewBag:
             isHidden: '0'
             cssClass: ri-arrow-up-down-line
@@ -33,18 +41,26 @@ items:
         items:
             -
                 title: Hereketler
+                nesting: null
                 type: cms-page
+                url: null
                 code: ''
                 reference: product/actions
+                cmsPage: null
+                replace: null
                 viewBag:
                     isHidden: '0'
                     cssClass: ''
                     isExternal: '0'
             -
                 title: 'Täze Haryt Sal'
+                nesting: null
                 type: url
                 url: /product/actions/inbox
                 code: ''
+                reference: null
+                cmsPage: null
+                replace: null
                 viewBag:
                     isHidden: '0'
                     cssClass: ''
@@ -65,13 +81,9 @@ items:
         items:
             -
                 title: 'Çig Mal Sarp Ediş'
-                nesting: null
+                type: cms-page
-                type: url
-                url: /ss
                 code: ''
-                reference: null
+                reference: production
-                cmsPage: null
-                replace: null
                 viewBag:
                     isHidden: '0'
                     cssClass: ''

themes/gokbakja/pages/product/actions.htm

@@ -51,9 +51,12 @@ function onStart(){
 ?>
 ==
 {% 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-bs4/css/dataTables.bootstrap4.min.css'|theme}}" rel="stylesheet"
-<link href="{{'assets/libs/datatables.net-buttons-bs4/css/buttons.bootstrap4.min.css'|theme}}" rel="stylesheet" type="text/css" />
+    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/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">
 
@@ -66,139 +69,170 @@ function onStart(){
 {% set stocks = builderList2.records %}
 
 <div class="row">
-	<div class="col-12">
+    <div class="col-12">
-		<div class="card">
+        <div class="card">
-			<div class="card-body">
+            <div class="card-body">
-				<div class="row">
+                <div class="row">
-					<div class="col-md-6">
+                    <div class="col-md-6">
-						<h3 class="card-title" style="font-size: 22px;color: #1e2038;">Harytlar</h3>
+                        <h3 class="card-title" style="font-size: 22px;color: #1e2038;">Harytlar</h3>
-						<p class="card-title-desc" style="color: #6c6ff5;">{{type}}</p>
+                        <p class="card-title-desc" style="color: #6c6ff5;">{{type}}</p>
-					</div>
+                    </div>
-					<div class="col-md-6" style="text-align: right;">
+                    <div class="col-md-6" style="text-align: right;">
                         {% if type == 'inbox' %}
-						<button onClick="createData();" type="button" class="btn btn-primary waves-effect waves-light"
+                        <button onClick="createData();" type="button" class="btn btn-primary waves-effect waves-light"
-							data-bs-toggle="offcanvas" data-bs-target="#offcanvasBottom"
+                            data-bs-toggle="offcanvas" data-bs-target="#offcanvasBottom"
-							aria-controls="offcanvasBottom">
+                            aria-controls="offcanvasBottom">
-							<i class="ri-add-line align-middle ms-2" style="font-size: 17px;"></i> Täze Hereket
+                            <i class="ri-add-line align-middle ms-2" style="font-size: 17px;"></i> Täze Hereket
-						</button>
+                        </button>
                         {% endif %}
-					</div>
+                    </div>
-				</div>
+                </div>
-				<table id="datatable-buttons" class="table table-striped table-bordered dt-responsive nowrap"
+                <table id="datatable-buttons" class="table table-striped table-bordered dt-responsive nowrap"
-					style="border-collapse: collapse; border-spacing: 0; width: 100%;">
+                    style="border-collapse: collapse; border-spacing: 0; width: 100%;">
-					<thead>
+                    <thead>
-						<tr>
+                        <tr>
-							<th style="width: 5%;">№</th>
+                            <th style="width: 5%;">№</th>
-							<th>Haryt</th>
+                            <th>Haryt</th>
-							<th>Görnüşi</th>
+                            <th>Görnüşi</th>
-							<th>Mukdary</th>
+                            <th>Mukdary (KG)</th>
-							<th>Senesi</th>
+                            <th>Senesi</th>
-							<th>Sklad</th>
+                            <th>Sklad</th>
-							<th>Sazlamalar</th>
+                            <th>Bellik</th>
-						</tr>
+                            <th>Sazlamalar</th>
-					</thead>
+                        </tr>
-					<tbody>
+                    </thead>
+                    <tbody>
                         {% for key, record in actions %}
-						<tr>
+                        <tr>
-							<td style="font-weight: bold;width: 5%;">{{key + 1}}</td>
+                            <td style="font-weight: bold;width: 5%;">{{key + 1}}</td>
-							<td><a
+                            <td><a style="font-weight: bold;color: #0005c5;">{{record.product.name}}</a></td>
-									style="font-weight: bold;color: #0005c5;">{{record.product.name}}</a></td>
+                            <td style="text-align: center;">
-							<td style="text-align: center;">
+                                <span
-							<span class="badge badge-soft-{% if record.type == 'inbox' %}success {% else %}danger {% endif %}" style="font-size: 14px;">{{record.type}}</span></td>
+                                    class="badge badge-soft-{% if record.type == 'inbox' %}success {% else %}danger {% endif %}"
-							<td style="color: #500101;font-weight: bold;">{{record.amount}}</td>
+                                    style="font-size: 14px;">{{record.type}}</span>
-							<td>{{record.created_at|date('d.m.Y')}}</td>
+                            </td>
-							<td>{{record.stock.name}}</td>
+                            <td style="color: #500101;font-weight: bold;">{{record.amount|number_format}} kg</td>
-							<td>
+                            <td>{{record.created_at|date('d.m.Y')}}</td>
+                            <td>{{record.stock.name}}</td>
+                            <td>{{record.note}}</td>
+                            <td>
                                 <div style="display: flex;justify-content: center;">
                                     <div style="margin-right: 10px;">
-                                        <a onClick="getData({{record.id}});" type="button" class="btn btn-warning waves-effect waves-light"
+                                        <a onClick="getData({{record.id}});" type="button"
-                                            data-bs-toggle="offcanvas" data-bs-target="#offcanvasBottom"
+                                            class="btn btn-warning waves-effect waves-light" data-bs-toggle="offcanvas"
-                                            aria-controls="offcanvasBottom"
+                                            data-bs-target="#offcanvasBottom" aria-controls="offcanvasBottom"
                                             style="padding-top: 5px;padding-bottom: 5px;">
                                             <i class="ri-pencil-line align-middle me-2"></i> Обновить
                                         </a>
                                     </div>
                                     <div>
                                         <a type="button" data-request-confirm="Вы уверены? Удалить этот продукт"
-                                            data-request-data="id:{{record.id}}"
+                                            data-request-data="id:{{record.id}}" data-request="onDeleteAction"
-                                            data-request="onDeleteAction"
                                             class="btn btn-danger waves-effect waves-light"
                                             style="padding-top: 5px;padding-bottom: 5px;">
                                             <i class="ri-close-line align-middle me-2"></i> Удалить
                                         </a>
                                     </div>
                                 </div>
-							</td>
+                            </td>
-						</tr>
+                        </tr>
-                       {% endfor %}
+                        {% endfor %}
-					</tbody>
+                    </tbody>
-					<tfoot>
+                    <tfoot>
-						<tr>
+                        <tr>
-							<th style="width: 5%;">№</th>
+                            <th style="width: 5%;">№</th>
-							<th>Haryt</th>
+                            <th>Haryt</th>
-							<th>Görnüşi</th>
+                            <th>Görnüşi</th>
-							<th>Mukdary</th>
+                            <th>Mukdary (KG)</th>
-							<th>Senesi</th>
+                            <th>Senesi</th>
-							<th>Sklad</th>
+                            <th>Sklad</th>
-							<th>Sazlamalar</th>
+                            <th>Bellik</th>
-						</tr>
+                            <th>Sazlamalar</th>
-					</tfoot>
+                        </tr>
-				</table>
+                    </tfoot>
-			</div>
+                </table>
+            </div>
 
-			<div class="offcanvas offcanvas-top" id="offcanvasBottom" aria-labelledby="offcanvasBottomLabel">
+            <div class="offcanvas offcanvas-top" id="offcanvasBottom" aria-labelledby="offcanvasBottomLabel"
-				<div class="offcanvas-header">
+                style="height: 40%;">
-					<h5 id="offcanvasBottomLabel">Täze Hereket</h5>
+                <div class="offcanvas-header">
-					<button onClick="createData();" type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas"
+                    <h5 id="offcanvasBottomLabel">Täze Hereket</h5>
-						aria-label="Close"></button>
+                    <button onClick="createData();" type="button" class="btn-close text-reset"
-				</div>
+                        data-bs-dismiss="offcanvas" aria-label="Close"></button>
-				<div class="offcanvas-body">
+                </div>
-					<form class="needs-validation" novalidate data-request="onCreateAction" id="prodForm">
+                <div class="offcanvas-body">
-						<div class="row">
+                    <form class="needs-validation" novalidate data-request="onCreateAction" id="prodForm">
-							<div class="col-md-4">
+                        <div class="row">
-								<div class="mb-3">
+                            <div class="col-md-4">
-									<label for="validationCustom01" class="form-label">Выберите продукт</label>
+                                <div class="mb-3">
-									<select class="form-control select2" name="product_id" id="productId">
+                                    <label for="validationCustom01" class="form-label">Haryt Saýla</label>
-										<option value="0">Выберите</option>
+                                    <select class="form-control select2" name="product_id" id="productId">
+                                        <option value="0">Saýla</option>
 
-										{% for record in products %}
+                                        {% for record in products %}
-                                            <option value="{{record.id}}" style="text-transform: capitalize;">{{record.name}}</option>
+                                        <option value="{{record.id}}" style="text-transform: capitalize;">
+                                            {{record.name}}</option>
                                         {% endfor %}
-									</select>
+                                    </select>
 
-								</div>
+                                </div>
-							</div>
+                            </div>
-							<div class="col-md-4">
+                            <div class="col-md-4">
-								<div class="mb-3">
+                                <div class="mb-3">
-									<label for="validationCustom02" class="form-label">Количество</label>
+                                    <label for="validationCustom02" class="form-label">Mukdary</label>
-									<input type="text" class="form-control" id="validationCustom02" placeholder="Количество"
+                                    <input type="number" class="form-control" id="validationCustom02"
-										name="quantity" required>
+                                        placeholder="Mukdary" name="quantity" required>
-									<div class="valid-feedback">
+                                    <div class="valid-feedback">
-										Правильно
+                                        dogry
-									</div>
+                                    </div>
-								</div>
+                                </div>
-							</div>
+                            </div>
 
-							<div class="col-md-4">
+                            <div class="col-md-4">
-								<label for="validationCustom03" class="form-label">Склад</label>
+                                <label for="validationCustom03" class="form-label">Sklad</label>
-								<select class="form-control select2" name="stock_id" id="stockId">
+                                <select class="form-control select2" name="stock_id" id="stockId">
-									<option value="0">Выберите</option>
+                                    <option value="0">Saýla</option>
 
-									{% for record in stocks %}
+                                    {% for record in stocks %}
-                                        <option value="{{record.id}}" style="text-transform: capitalize;">{{record.name}}</option>
+                                    <option value="{{record.id}}" style="text-transform: capitalize;">{{record.name}}
+                                    </option>
                                     {% endfor %}
-								</select>
+                                </select>
-							</div>
+                            </div>
-						</div>
+
+                            <div class="col-md-4">
+                                <div class="mb-3">
+                                    <label for="validationCustom02" class="form-label">Maşyn nomer</label>
+                                    <input type="text" class="form-control" id="validationCustom02"
+                                        placeholder="Maşyn Nomer" name="transport_no">
+                                </div>
+                            </div>
+
+                            <div class="col-md-4">
+                                <div class="mb-3">
+                                    <label for="validationCustom02" class="form-label">Sürüji</label>
+                                    <input type="text" class="form-control" id="validationCustom02" placeholder="Sürüji"
+                                        name="driver">
+                                </div>
+                            </div>
+
+                            <div class="col-md-4">
+                                <div class="mb-3">
+                                    <label for="validationCustom02" class="form-label">Bellik</label>
+                                    <input type="text" class="form-control" id="validationCustom02" placeholder="Bellik"
+                                        name="note">
+                                </div>
+                            </div>
+                        </div>
                         <input name="id" type="hidden" value="">
-						<div>
+                        <div>
-							<button class="btn btn-primary" type="submit" id="formBtn">Добавить</button>
+                            <button class="btn btn-primary" type="submit" id="formBtn">Goş</button>
-						</div>
+                        </div>
-					</form>
+                    </form>
-				</div>
+                </div>
-			</div>
+            </div>
-		</div>
+        </div>
-	</div>
+    </div>
 </div>
 
 
@@ -206,25 +240,31 @@ function onStart(){
 <script>
     function createData() {
         $('#prodForm').attr('data-request', 'onCreateAction');
-        $('#formBtn').html('Добавить');
+        $('#formBtn').html('Goş');
 
         $('input[name=id]').val('');
         $("#productId").select2().val(0).trigger("change");
         $('input[name=quantity]').val('');
+        $('input[name=driver]').val('');
+        $('input[name=transport_no]').val('');
+        $('input[name=note]').val('');
         $("#stockId").select2().val(0).trigger("change");
     }
 
     function getData(id) {
         $(this).request('onGetAction', {
-            data: {id: id},
+            data: { id: id },
             success: function (data) {
 
                 $('#prodForm').attr('data-request', 'onUpdateAction');
-                $('#formBtn').html('Обновить');
+                $('#formBtn').html('Täzele');
 
                 $('input[name=id]').val(data.id);
                 $("#productId").select2().val(data.product_id).trigger("change");
-                $('input[name=quantity]').val(data.quantity);
+                $('input[name=quantity]').val(data.amount);
+                $('input[name=driver]').val(data.driver);
+                $('input[name=transport_no]').val(data.transport_no);
+                $('input[name=note]').val(data.note);
                 $("#stockId").select2().val(data.stock_id).trigger("change");
             }
         });

themes/gokbakja/pages/product/stock.htm

@@ -9,6 +9,8 @@ function onStart(){
 
     $this["actions"] = Romanah\Gokbakja\Models\Action::select('romanah_gokbakja_action.*')
                         ->where("stock_id", $stockId)
+                        ->where("status_accountant", "accept")
+                        ->where("status_director", "accept")
                         ->addSelect(DB::raw("SUM(amount) as quantity"))
                         ->groupBy('romanah_gokbakja_action.product_id')
                         ->get();
@@ -52,7 +54,7 @@ function onStart(){
 							<th style="width: 5%;">№</th>
 							<th>Haryt</th>
 							<th>Hereket</th>
-							<th>Mukdary</th>
+							<th>Mukdary (KG)</th>
 							<th>Sene</th>
 							<th>Sklad</th>
 						</tr>
@@ -65,7 +67,7 @@ function onStart(){
 									style="font-weight: bold;color: #0005c5;">{{record.product.name}}</a></td>
 							<td style="text-align: center;">
 							<span class="badge badge-soft-{% if record.type == 'inbox' %}success {% else %}danger {% endif %}" style="font-size: 14px;">{{record.type}}</span></td>
-							<td style="color: #500101;font-weight: bold;">{{record.quantity}} {{record.product.attribute.name}}</td>
+							<td style="color: #500101;font-weight: bold;">{{record.quantity}} kg</td>
 							<td>{{record.created_at|date('d.m.Y')}}</td>
 							<td>{{record.stock.name}}</td>
 
@@ -77,7 +79,7 @@ function onStart(){
 							<th style="width: 5%;">№</th>
 							<th>Haryt</th>
 							<th>Hereket</th>
-							<th>Mukdary</th>
+							<th>Mukdary (KG)</th>
 							<th>Sene</th>
 							<th>Sklad</th>
 						</tr>

themes/gokbakja/pages/production.htm

@@ -0,0 +1,211 @@
+title = "Production"
+url = "/production"
+layout = "platform_main"
+is_hidden = 0
+
+[builderList]
+modelClass = "Romanah\Gokbakja\Models\Product"
+scope = "scopeGetReport"
+displayColumn = "id"
+noRecordsMessage = "No records found"
+detailsPage = "-"
+detailsUrlParameter = "id"
+pageNumber = "{{ :page }}"
+==
+<?php
+function onStart(){
+
+    $this["productions"] = Romanah\Gokbakja\Models\Production::with(['pivot_production'])->get();
+    $this["currentDate"] = Carbon\Carbon::now();
+}
+?>
+==
+{% set records = builderList.records %}
+{% set displayColumn = builderList.displayColumn %}
+{% set noRecordsMessage = builderList.noRecordsMessage %}
+{% set detailsPage = builderList.detailsPage %}
+{% set detailsKeyColumn = builderList.detailsKeyColumn %}
+{% set detailsUrlParameter = builderList.detailsUrlParameter %}
+
+
+
+
+{% 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" />
+{% endput %}
+
+<div class="container-fluid">
+    <div class="row">
+        <div class="col-lg-4">
+            <div class="card bg-primary text-white-50">
+                <div class="card-body">
+                    <h5 class="mb-4 text-white"><i class="mdi mdi-bullseye-arrow me-3"></i> Primary Card</h5>
+                    <p class="card-text">Some quick example text to build on the card title and make up the bulk of the
+                        card's content.</p>
+                </div>
+            </div>
+        </div>
+        <div class="col-lg-4">
+            <div class="card bg-primary text-white-50">
+                <div class="card-body">
+                    <h5 class="mb-4 text-white"><i class="mdi mdi-bullseye-arrow me-3"></i> Primary Card</h5>
+                    <p class="card-text">Some quick example text to build on the card title and make up the bulk of the
+                        card's content.</p>
+                </div>
+            </div>
+        </div>
+        <div class="col-lg-4">
+            <div class="card bg-primary text-white-50">
+                <div class="card-body">
+                    <h5 class="mb-4 text-white"><i class="mdi mdi-bullseye-arrow me-3"></i> Primary Card</h5>
+                    <p class="card-text">Some quick example text to build on the card title and make up the bulk of the
+                        card's content.</p>
+                </div>
+            </div>
+        </div>
+
+    </div>
+    <!-- end row -->
+    <div class="row">
+        <div class="col-md-12">
+            <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;">Çig Mallar Boýunça
+                                ({{currentDate|date('d.m.Y')}})</h3>
+                            <p class="card-title-desc" style="color: #6c6ff5;">Hasabat</p>
+                        </div>
+                        <!-- <div class="col-md-6" style="text-align: right;">
+                            <button type="button" class="btn btn-primary waves-effect waves-light"
+                                data-bs-toggle="offcanvas" data-bs-target="#offcanvasBottom"
+                                aria-controls="offcanvasBottom">
+                                <i class="ri-add-line align-middle ms-2" style="font-size: 17px;"></i> Добавить
+                            </button>
+                        </div> -->
+                    </div>
+
+                    <h1>{{productions}}</h1>
+                    <form>
+                        <div class="table-responsive">
+                            <table class="table mb-0">
+
+                                <thead class="table-light">
+                                    <tr>
+                                        <th style="width: 5%;">№</th>
+                                        <th>Senesi</th>
+                                        <th>Hemmesi</th>
+                                        {% for key, record in records %}
+                                        <th>{{record.name}}</th>
+                                        {% endfor %}
+                                        <th>Bellik</th>
+                                    </tr>
+
+                                </thead>
+                            </table>
+                        </div>
+
+                    </form>
+                    <table id="datatable-buttons" class="table table-striped table-bordered dt-responsive nowrap"
+                        style="border-collapse: collapse; border-spacing: 0; width: 100%;">
+                        <thead>
+                            <tr>
+                                <th style="width: 5%;">№</th>
+                                <th>Senesi</th>
+                                <th>Hemmesi</th>
+                                {% for key, record in records %}
+                                <th>{{record.name}}</th>
+                                {% endfor %}
+                                <th>Bellik</th>
+                                <!--  <th>Настройки</th> -->
+                            </tr>
+                        </thead>
+                        <tbody>
+
+                            {% for report in productions %}
+                            <tr>
+                                <td style="font-weight: bold;width: 5%;">{{key + 1}}</td>
+                                <td><a href="#" style="font-weight: bold;color: #0005c5;">{{report.date|date('d.m.Y |
+                                        H:i')}}</a></td>
+                                <td style="text-align: center;">
+                                    <span class="badge badge-soft-success"
+                                        style="font-size: 14px;">{{report.all_amount|number_format}} kg</span>
+                                </td>
+
+                                {% for product in record.pivot_production %}
+                                <td>{{product.amount_percentage}} %</td>
+                                {% endfor %}
+
+                                <td>{{record.note}}</td>
+                            </tr>
+                            {% endfor %}
+
+                        </tbody>
+                        <tfoot>
+                            <tr>
+                                <th style="width: 5%;">№</th>
+                                <th>Senesi</th>
+                                <th>Hemmesi</th>
+                                {% for key, record in records %}
+                                <th>{{record.name}}</th>
+                                {% endfor %}
+                                <th>Bellik</th>
+                            </tr>
+                        </tfoot>
+                    </table>
+                </div>
+
+
+
+                <div class="offcanvas offcanvas-top" tabindex="-1" id="offcanvasBottom"
+                    aria-labelledby="offcanvasBottomLabel">
+                    <div class="offcanvas-header">
+                        <h5 id="offcanvasBottomLabel">Добавить Склад</h5>
+                        <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas"
+                            aria-label="Close"></button>
+                    </div>
+                    <div class="offcanvas-body">
+                        <form class="needs-validation" novalidate action="/stocks/create" method="POST">
+                            <div class="row">
+                                <div class="col-md-6">
+                                    <div class="mb-3">
+                                        <label for="validationCustom01" class="form-label">Имя Склад</label>
+                                        <input type="text" class="form-control" id="validationCustom01"
+                                            placeholder="Имя Склад" name="name" required>
+                                        <div class="valid-feedback">
+                                            Правильно
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-6">
+                                    <div class="mb-3">
+                                        <label for="validationCustom02" class="form-label">Описание</label>
+                                        <input type="text" class="form-control" name="desc" id="validationCustom02"
+                                            placeholder="Описание" required>
+                                        <div class="valid-feedback">
+                                            Правильно
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div>
+                                <button class="btn btn-primary" type="submit">Добавить</button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+
+
+
+            </div>
+        </div>
+    </div>
+
+</div>
+
+{% partial 'dataTableJs' %}