From 88e691582855a44c7513606ebeb61e479672c605 Mon Sep 17 00:00:00 2001 From: Shohrat Date: Tue, 19 Sep 2023 01:22:50 +0500 Subject: [PATCH] production --- plugins/romanah/gokbakja/Plugin.php | 1 + .../gokbakja/components/Production.php | 28 +++ .../romanah/gokbakja/models/Production.php | 10 +- ...te_romanah_gokbakja_pivot_production_4.php | 23 +++ ...e_update_romanah_gokbakja_production_3.php | 23 +++ ...e_update_romanah_gokbakja_production_4.php | 23 +++ plugins/romanah/gokbakja/updates/version.yaml | 9 + themes/gokbakja/pages/all-productions.htm | 165 ++++++++++++++++++ themes/gokbakja/pages/production.htm | 100 ++++++----- 9 files changed, 340 insertions(+), 42 deletions(-) create mode 100644 plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_pivot_production_4.php create mode 100644 plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_3.php create mode 100644 plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_4.php create mode 100644 themes/gokbakja/pages/all-productions.htm diff --git a/plugins/romanah/gokbakja/Plugin.php b/plugins/romanah/gokbakja/Plugin.php index 645781e..d7db121 100644 --- a/plugins/romanah/gokbakja/Plugin.php +++ b/plugins/romanah/gokbakja/Plugin.php @@ -8,6 +8,7 @@ class Plugin extends PluginBase { return [ 'Romanah\Gokbakja\Components\Action' => 'action', + 'Romanah\Gokbakja\Components\Production' => 'production', ]; } diff --git a/plugins/romanah/gokbakja/components/Production.php b/plugins/romanah/gokbakja/components/Production.php index 274f45e..2b2cb8d 100644 --- a/plugins/romanah/gokbakja/components/Production.php +++ b/plugins/romanah/gokbakja/components/Production.php @@ -3,6 +3,7 @@ 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\PivotProduction as PivotProductionModel; use Redirect; @@ -27,6 +28,33 @@ class Production extends ComponentBase $data = post(); + $createProduction = new ProductionModel(); + + $createProduction->all_amount = $data["all_amount"]; + $createProduction->note = $data["note"]; + $createProduction->user_id = $user->id; + $createProduction->save(); + + $products = ProductModel::where("report", "simple")->get(); + + for ($x = 0; $x < count($products); $x++) { + $fieldName = "product_".$products[$x]->code; + + $createPivotProduction = new PivotProductionModel(); + $createPivotProduction->production_id = $createProduction->id; + $createPivotProduction->product_id = $products[$x]->id; + $createPivotProduction->amount_percentage = $data[$fieldName]; + $createPivotProduction->product_name = $products[$x]->name; + $createPivotProduction->product_code = $products[$x]->code; + $createPivotProduction->amount = ($data[$fieldName] / 100) * ($createProduction->all_amount); + $createPivotProduction->save(); + } + + if ($createProduction && $createPivotProduction) { + Flash::success("Hasabat Ustunlikli Goşuldy"); + return Redirect::refresh(); + } + } public function onUpdateProduction() diff --git a/plugins/romanah/gokbakja/models/Production.php b/plugins/romanah/gokbakja/models/Production.php index c39afce..1e30588 100644 --- a/plugins/romanah/gokbakja/models/Production.php +++ b/plugins/romanah/gokbakja/models/Production.php @@ -1,7 +1,8 @@ select('id', 'created_at', 'all_amount', 'note', DB::raw('count(id) as `data`'), DB::raw("DATE_FORMAT(created_at, '%d-%m-%Y') new_date"), DB::raw('YEAR(created_at) year, MONTH(created_at) month, DAY(created_at) day')) + ->orderBy('id', 'DESC') + ->groupby('year','month', 'day'); + } + /** diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_pivot_production_4.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_pivot_production_4.php new file mode 100644 index 0000000..fb31695 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_pivot_production_4.php @@ -0,0 +1,23 @@ +renameColumn('amout', 'amount'); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_pivot_production', function($table) + { + $table->renameColumn('amount', 'amout'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_3.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_3.php new file mode 100644 index 0000000..b9754e1 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_3.php @@ -0,0 +1,23 @@ +integer('user_id'); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_production', function($table) + { + $table->dropColumn('user_id'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_4.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_4.php new file mode 100644 index 0000000..75423e7 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_4.php @@ -0,0 +1,23 @@ +dateTime('date')->nullable()->change(); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_production', function($table) + { + $table->dateTime('date')->nullable(false)->change(); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/version.yaml b/plugins/romanah/gokbakja/updates/version.yaml index b9c3949..d7b1118 100644 --- a/plugins/romanah/gokbakja/updates/version.yaml +++ b/plugins/romanah/gokbakja/updates/version.yaml @@ -93,3 +93,12 @@ 1.0.32: - 'Updated table romanah_gokbakja_pivot_production' - builder_table_update_romanah_gokbakja_pivot_production_3.php +1.0.33: + - 'Updated table romanah_gokbakja_production' + - builder_table_update_romanah_gokbakja_production_3.php +1.0.34: + - 'Updated table romanah_gokbakja_production' + - builder_table_update_romanah_gokbakja_production_4.php +1.0.35: + - 'Updated table romanah_gokbakja_pivot_production' + - builder_table_update_romanah_gokbakja_pivot_production_4.php diff --git a/themes/gokbakja/pages/all-productions.htm b/themes/gokbakja/pages/all-productions.htm new file mode 100644 index 0000000..96f07b9 --- /dev/null +++ b/themes/gokbakja/pages/all-productions.htm @@ -0,0 +1,165 @@ +title = "All Productions" +url = "/all-productions" +layout = "platform_main" +is_hidden = 0 + +[builderList] +modelClass = "Romanah\Gokbakja\Models\Production" +scope = "scopeGetByGroup" +scopeValue = "{{ :scope }}" +displayColumn = "id" +noRecordsMessage = "No records found" +detailsPage = "-" +detailsUrlParameter = "id" +pageNumber = "{{ :page }}" +== +{% set productions = builderList.records %} +{% set displayColumn = builderList.displayColumn %} +{% set noRecordsMessage = builderList.noRecordsMessage %} +{% set detailsPage = builderList.detailsPage %} +{% set detailsKeyColumn = builderList.detailsKeyColumn %} +{% set detailsUrlParameter = builderList.detailsUrlParameter %} + + + +{% put styles %} + + + +{% endput %} + +
+
+ + +
+ +
+
+
+
+
+
+

Çig Mallar Boýunça Ähli

+

Hasabat

+
+ +
+ + + + + + + + + + + + + {% for key, report in productions %} + + + + + + + {% endfor %} + + + + + + + + + + +
№SenesiMukdaryBellik
{{key + 1}}{{report.created_at|date("d.m.Y | H:i")}}{{report.all_amount|number_format}}{{report.note}}
№SenesiMukdaryBellik
+
+ + + +
+
+
Добавить Склад
+ +
+
+
+
+
+
+ + +
+ Правильно +
+
+
+
+
+ + +
+ Правильно +
+
+
+
+
+ +
+
+
+
+ + + +
+
+
+ +
+ +{% partial 'dataTableJs' %} diff --git a/themes/gokbakja/pages/production.htm b/themes/gokbakja/pages/production.htm index f601d16..3ed854b 100644 --- a/themes/gokbakja/pages/production.htm +++ b/themes/gokbakja/pages/production.htm @@ -6,17 +6,24 @@ is_hidden = 0 [builderList] modelClass = "Romanah\Gokbakja\Models\Product" scope = "scopeGetReport" +scopeValue = "{{ :scope }}" displayColumn = "id" noRecordsMessage = "No records found" detailsPage = "-" detailsUrlParameter = "id" pageNumber = "{{ :page }}" + +[production] == get(); - $this["currentDate"] = Carbon\Carbon::now(); + $currentDate = Carbon\Carbon::now()->timezone('UTC +05:00'); + + $currentDateFormat = Carbon\Carbon::now()->format('Y-m-d'); + + $this["currentDate"] = $currentDate; + $this["productions"] = Romanah\Gokbakja\Models\Production::whereDate('created_at', date($currentDateFormat))->with(['pivot_production'])->get(); } ?> == @@ -41,7 +48,23 @@ function onStart(){
-
+
+ +
+
HEMMESI
+

Bu bölümde hasabatyň aýlar boýunça ählisini görüp bilersiňiz.

+
+ +
+
+
+
+
ORTAÇA ÖNÜMÇILIK
+

Bu bölümde ortaça önümçilik boýunça hasabat.

+
+
+
+
@@ -78,7 +83,7 @@ function onStart(){

Çig Mallar Boýunça - ({{currentDate|date('d.m.Y')}})

+ ({{currentDate|date('d.m.Y | H:i')}})

Hasabat

-

{{productions}}

-
-
- - +
+
+ + + + - - - + + {% for key, record in records %} - + {% endfor %} - + + + + + +
№SenesiHemmesiTäze maglumat + + {{record.name}} + + Bellik + + + +
+
- - -
- @@ -127,21 +145,21 @@ function onStart(){ - {% for report in productions %} + {% for key, report in productions %} - - {% for product in record.pivot_production %} + {% for product in report.pivot_production %} {% endfor %} - + {% endfor %}
{{key + 1}}{{report.date|date('d.m.Y | + {{report.created_at|date('d.m.Y | H:i')}} {{report.all_amount|number_format}} kg {{product.amount_percentage}} %{{record.note}}{{report.note}}