diff --git a/config/database.php b/config/database.php index abd6a3e..cd32e88 100644 --- a/config/database.php +++ b/config/database.php @@ -57,7 +57,7 @@ return [ 'engine' => 'InnoDB', 'host' => 'localhost', 'port' => 3306, - 'database' => 'gok_bakja_stock', + 'database' => 'gok_bakja_from_server', 'username' => 'root', 'password' => 'bt110226', 'charset' => 'utf8mb4', diff --git a/plugins/rainlab/user/models/user/fields.yaml b/plugins/rainlab/user/models/user/fields.yaml index 740248a..393028a 100644 --- a/plugins/rainlab/user/models/user/fields.yaml +++ b/plugins/rainlab/user/models/user/fields.yaml @@ -108,6 +108,7 @@ tabs: orders: Sargytlar crudOrders: 'Sargytlar dolandyrmak' journal: Žurnal + drobika: Drobika emptyOption: Sayla showSearch: true span: full diff --git a/plugins/romanah/gokbakja/Plugin.php b/plugins/romanah/gokbakja/Plugin.php index 7b0ef13..e4254d5 100644 --- a/plugins/romanah/gokbakja/Plugin.php +++ b/plugins/romanah/gokbakja/Plugin.php @@ -17,6 +17,7 @@ class Plugin extends PluginBase 'Romanah\Gokbakja\Components\OrderItem' => 'orderItem', 'Romanah\Gokbakja\Components\Journal' => 'journal', 'Romanah\Gokbakja\Components\LoadTransport' => 'loadTransport', + 'Romanah\Gokbakja\Components\Drobika' => 'drobika', ]; } diff --git a/plugins/romanah/gokbakja/components/Drobika.php b/plugins/romanah/gokbakja/components/Drobika.php new file mode 100644 index 0000000..8d1fcb4 --- /dev/null +++ b/plugins/romanah/gokbakja/components/Drobika.php @@ -0,0 +1,239 @@ + 'Drobika', + 'description' => 'Drobika settings' + ]; + } + + public function onReportDrobika() + { + + $currentDate = Carbon::now(); + $currentDateFormat = $currentDate->format('Y-m-d'); + + $data = post(); + + + $drobikaProductions = ModelsDrobika::with(["shift", "product"])->orderBy('id', 'DESC'); + + $product = $data["product_id"]; + $shift_id = $data["shift_id"]; + $start = Carbon::parse($data["start"])->format('Y-m-d'); + $end = Carbon::parse($data["end"])->format('Y-m-d'); + + + if ($product) { + $drobikaProductions->where("product_id", $product); + } + + if ($shift_id) { + $drobikaProductions->where("shift_id", $shift_id); + } + + if ($start != $currentDateFormat) { + $drobikaProductions->whereBetween('date', [$start, $end]); + } + + $drobikaDatas = $drobikaProductions->get(); + + + $sumProduced = $drobikaDatas->sum("produced_weight"); + $sumAmount = $drobikaDatas->sum("amount"); + + + $html_data = ''; + + for ($x = 0; $x < count($drobikaDatas); $x++) { + $statusTitle = ''; + + $html_data .= ' + '.($x+1).' + '.$drobikaDatas[$x]->product->code.' + '.$drobikaDatas[$x]->shift->desc.' + '.(Carbon::parse($drobikaDatas[$x]->date)->format('d.m.Y') ?? '').' + '.number_format($drobikaDatas[$x]->amount).' kg + '.number_format($drobikaDatas[$x]->produced_weight).' kg + '.$drobikaDatas[$x]->note.' + '; + } + + if ($drobikaDatas) { + return [ + '#drobika_datas' => $html_data, + '#all_amount' => ' +
+
+
+
Işlenen Çig mal: ' . number_format($sumAmount) . ' kg
+
+
+
+
+
+
+
Önen çig mal : ' . number_format($sumProduced) . ' kg
+
+
+
', + ]; + } else { + Flash::error("Yalnyshlyk bar!!"); + } + } + + public function onModalSetDrobika() + { + + $data = post(); + + $drobika = ModelsDrobika::where("id", $data["id"])->first(); + + $html_data = '
+ + +
+
+
+
+ + + +
+
+ +
+ + + +
+
+
+
+
+ + + +
+
+ +
+
+ + + +
+
+ +
+
+ + + +
+
+ +
+ + +
+
'; + + return [ + '#modal-form' => $html_data, + ]; + } + + + public function onCreateDrobika() + { + $user = \Auth::user(); + + $data = post(); + + $drobika = new ModelsDrobika (); + $drobika->product_id = $data["product_id"]; + $drobika->shift_id = $data["shift_id"]; + $drobika->user_id = $user->id; + $drobika->amount = $data["amount"]; + $drobika->date = Carbon::parse($data["date"])->format('Y-m-d');; + $drobika->note = $data["note"]; + $drobika->produced_weight = $data["produced_weight"]; + $drobika->save(); + + if ($drobika) { + Flash::success("Maglumatlar Ustunlikli Girizildi"); + return Redirect::refresh(); + } else { + Flash::error("Yalnyshlyk bar!!"); + return Redirect::refresh(); + } + + } + + public function onUpdateDrobika() + { + + $data = post(); + + $drobika = ModelsDrobika::where('id', $data["id"])->first(); + $drobika->amount = $data["amount"]; + $drobika->date = Carbon::parse($data["date"])->format('Y-m-d');; + $drobika->note = $data["note"]; + $drobika->produced_weight = $data["produced_weight"]; + $drobika->save(); + + if ($drobika) { + Flash::success("Maglumatlar Ustunlikli Girizildi"); + return Redirect::refresh(); + } else { + Flash::error("Yalnyshlyk bar!!"); + return Redirect::refresh(); + } + + } + + public function onDeleteDrobika() + { + + $data = post(); + + $drobika = ModelsDrobika::where('id', $data["id"])->first(); + $drobika->delete(); + + if ($drobika) { + Flash::success("Maglumatlar Ustunlikli Pozuldy"); + return Redirect::refresh(); + } else { + Flash::error("Yalnyshlyk bar!!"); + return Redirect::refresh(); + } + + } + + +} diff --git a/plugins/romanah/gokbakja/components/Production.php b/plugins/romanah/gokbakja/components/Production.php index 686cf6b..4a525b5 100644 --- a/plugins/romanah/gokbakja/components/Production.php +++ b/plugins/romanah/gokbakja/components/Production.php @@ -97,7 +97,7 @@ class Production extends ComponentBase for ($x = 0; $x < count($productionsFiltered); $x++) { $date = ""; if($productionsFiltered[$x]->date != null){ - $date = Carbon::parse($productionsFiltered[$x]->date)->format('d.m.Y').' | '.Carbon::parse($productionsFiltered[$x]->time)->format('H:i'); + $date = Carbon::parse($productionsFiltered[$x]->date)->format('d.m.Y').' | '.$productionsFiltered[$x]->time; }else{ $date = ""; } diff --git a/plugins/romanah/gokbakja/components/Sewer.php b/plugins/romanah/gokbakja/components/Sewer.php index 150f28e..60765e2 100644 --- a/plugins/romanah/gokbakja/components/Sewer.php +++ b/plugins/romanah/gokbakja/components/Sewer.php @@ -193,22 +193,22 @@ class Sewer extends ComponentBase return Redirect::refresh(); } else { if (($data["status"] == "complated") && ($data["produced_bag_qty"] > 0)) { + $sewer = SewerModel::where("id", $data["sewer_id"])->first(); $pivotSewer = PivotSewer::where("sewer_production_id", $data["sewer_id"])->first(); - // $spentCalc = (float)((float) $pivotSewer->amount - (float) $data["left_amount"]); - $spentCalc = (float)((float) $data["produced_bag_qty"] * (float) $pivotSewer->bag_gram) / 1000; - $spentCalcDefective = (float)((float) $data["defective_bag_qty"] * (float) $pivotSewer->bag_gram) / 1000; - $spentCalcDefectiveRepair = (float)((float) $data["defective_repair_qty"] * (float) $pivotSewer->bag_gram) / 1000; - $spentCalcDefectiveAll = (float)($spentCalcDefective + $spentCalcDefectiveRepair); + if ($sewer->is_sewed == 1) { + // $spentCalc = (float)((float) $pivotSewer->amount - (float) $data["left_amount"]); + $spentCalc = (float)((float) $data["produced_bag_qty"] * (float) $pivotSewer->bag_gram) / 1000; + $spentCalcDefective = (float)((float) $data["defective_bag_qty"] * (float) $pivotSewer->bag_gram) / 1000; + $spentCalcDefectiveRepair = (float)((float) $data["defective_repair_qty"] * (float) $pivotSewer->bag_gram) / 1000; + + $spentCalcDefectiveAll = (float)($spentCalcDefective + $spentCalcDefectiveRepair); + + $allSpent = (float)($spentCalc + $spentCalcDefectiveAll); - $allSpent = (float)($spentCalc + $spentCalcDefectiveAll); - if ($allSpent > $pivotSewer->amount) { - Flash::error("Ulanylan Rulon agramy berilen rulondan uly!! Halta sanyny dogry giriziň!!"); - return Redirect::refresh(); - } else { $leftCalc = (float)((float)$pivotSewer->amount - $spentCalc); $sewer->shift_id = $data["shift_id"]; @@ -265,6 +265,60 @@ class Sewer extends ComponentBase Flash::error("Yalnyshlyk bar!!"); return Redirect::refresh(); } + }else{ + + $spentCalc = 0; + $spentCalcDefective = 0; + $spentCalcDefectiveRepair = 0; + + $spentCalcDefectiveAll = (float)($spentCalcDefective + $spentCalcDefectiveRepair); + + $allSpent = (float)($spentCalc + $spentCalcDefectiveAll); + + + $leftCalc = (float)((float)$pivotSewer->amount - $spentCalc); + + $sewer->shift_id = $data["shift_id"]; + $sewer->sewer_machine_id = $data["sewer_machine_id"]; + $sewer->defective_repair_qty = (float) $data["defective_repair_qty"]; + $sewer->pipe_weight = (float) $data["pipe_weight"]; + + $sewer->produced_bag_qty = (float) $data["produced_bag_qty"]; + $sewer->defective_bag_qty = (float) $data["defective_bag_qty"]; + $sewer->width = (float) $data["width"]; + $sewer->height = (float) $data["height"]; + $sewer->date = Carbon::parse($data["date"])->format('Y-m-d'); + $sewer->note = $data["note"]; + $sewer->save(); + + $pivotSewer->left_amount = (float) ((float)$leftCalc - (float)$spentCalcDefectiveAll); + $pivotSewer->spent_amount = (float) ((float)$spentCalc + (float)$spentCalcDefectiveAll); + $pivotSewer->spent_defective_amount = (float) $spentCalcDefectiveAll; + $pivotSewer->status = $data["status"]; + $pivotSewer->save(); + + + $createResultBag = new BagAction(); + $createResultBag->product_id = $sewer->id; + $createResultBag->type = 'inbox'; + $createResultBag->status_accountant = "new"; + $createResultBag->status_director = "new"; + $createResultBag->note = "Sürülmedikler täzeden sürüldi"; + $createResultBag->amount = $sewer->produced_bag_qty; + $createResultBag->stock_id = $stockBag->id; + $createResultBag->user_id = $user->id; + $createResultBag->save(); + + + + if ($sewer && $pivotSewer && $createResultBag) { + Flash::success("Maglumatlar Ustunlikli Üýtgedildi"); + return Redirect::refresh(); + } else { + Flash::error("Yalnyshlyk bar!!"); + return Redirect::refresh(); + } + } } else { Flash::error("Statusy Tamlaň ya-da halta sany girizilmedik"); @@ -285,7 +339,7 @@ class Sewer extends ComponentBase }])->orderBy('id', 'DESC')->get(); - // dd($sewerDatas); + //dd($sewerDatas); for ($x = 0; $x < count($sewerDatas); $x++) { $dateTitle = ($sewerDatas[$x]->date == null ? "" : Carbon::parse($sewerDatas[$x]->date)->format('d.m.Y')); @@ -299,6 +353,14 @@ class Sewer extends ComponentBase $editBtn = ''; + $rulonDynamic = ''; + + if ($sewerDatas[$x]->is_sewed == 1) { + $rulonDynamic = '#Rulon' . ($sewerDatas[$x]->pivot_sewer[0]->rulon_action->product_id ?? 0) . '- ' . ($sewerDatas[$x]->pivot_sewer[0]->rulon_action->product->bag_size->width ?? "") . 'x' . ($sewerDatas[$x]->pivot_sewer[0]->rulon_action->product->bag_size->height ?? "") . 'm2, ' . ($sewerDatas[$x]->pivot_sewer[0]->rulon_action->product->bag_type->name ?? "") . ', ' . ($sewerDatas[$x]->pivot_sewer[0]->rulon_action->product->color->name ?? ""); + } else { + $rulonDynamic = 'Sürülmedik täzeden sürüldi'; + } + if ($sewerDatas[$x]->user_id != $user->id) { $editBtn = '
@@ -337,7 +399,8 @@ class Sewer extends ComponentBase ' . ($x + 1) . ' ' . $dateTitle . ' #Dikiş' . $sewerDatas[$x]->id . ' - #Rulon' . $sewerDatas[$x]->pivot_sewer[0]->rulon_action->product_id . '- ' . ($sewerDatas[$x]->pivot_sewer[0]->rulon_action->product->bag_size->width ?? "") . 'x' . ($sewerDatas[$x]->pivot_sewer[0]->rulon_action->product->bag_size->height ?? "") . 'm2, ' . ($sewerDatas[$x]->pivot_sewer[0]->rulon_action->product->bag_type->name ?? "") . ', ' . ($sewerDatas[$x]->pivot_sewer[0]->rulon_action->product->color->name ?? "") . ' + + ' . $rulonDynamic . ' ' . number_format($sewerDatas[$x]->pivot_sewer[0]->amount, 2) . ' kg @@ -356,7 +419,7 @@ class Sewer extends ComponentBase ' . ($sewerDatas[$x]->defective_bag_qty ?? 0) . ' ' . ($sewerDatas[$x]->defective_repair_qty ?? 0) . ' ' . number_format($sewerDatas[$x]->pivot_sewer[0]->spent_amount, 2) . ' kg - ' . number_format($sewerDatas[$x]->pivot_sewer[0]->left_amount, 2) . ' kg + ' . number_format($sewerDatas[$x]->pivot_sewer[0]->left_amount, 2) . ' kg ' . $statusTitle . ' @@ -543,9 +606,11 @@ class Sewer extends ComponentBase $data = post(); - $currentRulonAction = RulonAction::where("id", $data["rulon_action_id"])->first(); - $rulonAmountSum = $currentRulonAction->amount; - $stock = Stock::where("type", 'rulon')->first(); + if ($data["is_sewed"] == 1) { + $currentRulonAction = RulonAction::where("id", $data["rulon_action_id"])->first(); + $rulonAmountSum = $currentRulonAction->amount; + $stock = Stock::where("type", 'rulon')->first(); + } // dd($leftAmount); $createSewer = new SewerModel(); @@ -555,9 +620,10 @@ class Sewer extends ComponentBase $createSewer->defective_bag_qty = 0; $createSewer->user_id = $user->id; $createSewer->note = $data["note"] ?? ''; - $createSewer->rulon_action_id = $data["rulon_action_id"]; + $createSewer->rulon_action_id = $data["is_sewed"] ? $data["rulon_action_id"] : 0; $createSewer->width = (float) $data["width"]; $createSewer->height = (float) $data["height"]; + $createSewer->is_sewed = $data["is_sewed"]; $createSewer->date = Carbon::parse($data["date"])->format('Y-m-d'); $createSewer->save(); @@ -566,20 +632,22 @@ class Sewer extends ComponentBase $createPivotSewer->sewer_production_id = $createSewer->id; $createPivotSewer->left_amount = 0; $createPivotSewer->bag_gram = (float) $data["bag_gram"]; - $createPivotSewer->amount = $rulonAmountSum; + $createPivotSewer->amount = $rulonAmountSum ?? 0; $createPivotSewer->save(); - $createResult = new RulonAction(); - $createResult->product_id = $currentRulonAction->product_id; - $createResult->type = 'outbox'; - $createResult->amount = -$rulonAmountSum; - $createResult->stock_id = $stock->id; - $createResult->user_id = $user->id; - $createResult->note = "#Dikiş" . $createSewer->id . " üçin çykaryldy"; - $createResult->save(); + if ($createSewer->is_sewed == 1) { + $createResult = new RulonAction(); + $createResult->product_id = $currentRulonAction->product_id; + $createResult->type = 'outbox'; + $createResult->amount = -$rulonAmountSum; + $createResult->stock_id = $stock->id; + $createResult->user_id = $user->id; + $createResult->note = "#Dikiş" . $createSewer->id . " üçin çykaryldy"; + $createResult->save(); + } - if ($createSewer && $createPivotSewer && $createResult) { + if ($createSewer && $createPivotSewer) { Flash::success("Maglumatlar Ustunlikli Goshuldy"); return Redirect::refresh(); diff --git a/plugins/romanah/gokbakja/models/Drobika.php b/plugins/romanah/gokbakja/models/Drobika.php new file mode 100644 index 0000000..642f51e --- /dev/null +++ b/plugins/romanah/gokbakja/models/Drobika.php @@ -0,0 +1,41 @@ + [ + 'RainLab\User\Models\User', + 'key' => 'user_id' + ], + 'product' => [ + 'Romanah\Gokbakja\Models\Product', + 'key' => 'product_id' + ], + 'shift' => [ + 'Romanah\Gokbakja\Models\Shift', + 'key' => 'shift_id' + ], + ]; + + /** + * @var string The database table used by the model. + */ + public $table = 'romanah_gokbakja_drobika'; + + /** + * @var array Validation rules + */ + public $rules = [ + ]; +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_create_romanah_gokbakja_drobika.php b/plugins/romanah/gokbakja/updates/builder_table_create_romanah_gokbakja_drobika.php new file mode 100644 index 0000000..632d592 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_create_romanah_gokbakja_drobika.php @@ -0,0 +1,28 @@ +engine = 'InnoDB'; + $table->increments('id')->unsigned(); + $table->timestamp('created_at')->nullable(); + $table->timestamp('updated_at')->nullable(); + $table->timestamp('deleted_at')->nullable(); + $table->integer('product_id'); + $table->double('amount', 10, 0); + $table->text('note')->nullable(); + $table->date('date'); + }); + } + + public function down() + { + Schema::dropIfExists('romanah_gokbakja_drobika'); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_drobika.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_drobika.php new file mode 100644 index 0000000..4a231a6 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_drobika.php @@ -0,0 +1,23 @@ +double('produced_weight', 10, 0); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_drobika', function($table) + { + $table->dropColumn('produced_weight'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_drobika_2.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_drobika_2.php new file mode 100644 index 0000000..179f8af --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_drobika_2.php @@ -0,0 +1,23 @@ +integer('user_id'); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_drobika', function($table) + { + $table->dropColumn('user_id'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_drobika_3.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_drobika_3.php new file mode 100644 index 0000000..3bcbdf7 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_drobika_3.php @@ -0,0 +1,23 @@ +integer('shift_id'); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_drobika', function($table) + { + $table->dropColumn('shift_id'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_machine_19.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_machine_19.php new file mode 100644 index 0000000..031c424 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_machine_19.php @@ -0,0 +1,23 @@ +boolean('is_not_sewed')->default(0); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_production_machine', function($table) + { + $table->dropColumn('is_not_sewed'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_machine_20.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_machine_20.php new file mode 100644 index 0000000..0d17d22 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_machine_20.php @@ -0,0 +1,23 @@ +dropColumn('is_not_sewed'); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_production_machine', function($table) + { + $table->boolean('is_not_sewed')->default(0); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_sewer_production_13.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_sewer_production_13.php new file mode 100644 index 0000000..a8e1354 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_sewer_production_13.php @@ -0,0 +1,23 @@ +boolean('is_sewed')->default(1); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_sewer_production', function($table) + { + $table->dropColumn('is_sewed'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_sewer_production_14.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_sewer_production_14.php new file mode 100644 index 0000000..cf5a6ca --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_sewer_production_14.php @@ -0,0 +1,25 @@ +double('additional', 10, 0)->nullable(); + $table->boolean('is_sewed')->nullable()->change(); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_sewer_production', function($table) + { + $table->dropColumn('additional'); + $table->boolean('is_sewed')->nullable(false)->change(); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_sewer_production_15.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_sewer_production_15.php new file mode 100644 index 0000000..419b27b --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_sewer_production_15.php @@ -0,0 +1,23 @@ +renameColumn('additional', 'additional_amount'); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_sewer_production', function($table) + { + $table->renameColumn('additional_amount', 'additional'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/version.yaml b/plugins/romanah/gokbakja/updates/version.yaml index 1f95afc..1f778d6 100644 --- a/plugins/romanah/gokbakja/updates/version.yaml +++ b/plugins/romanah/gokbakja/updates/version.yaml @@ -429,3 +429,30 @@ 1.0.144: - 'Updated table romanah_gokbakja_production_machine' - builder_table_update_romanah_gokbakja_production_machine_18.php +1.0.145: + - 'Updated table romanah_gokbakja_production_machine' + - builder_table_update_romanah_gokbakja_production_machine_19.php +1.0.146: + - 'Updated table romanah_gokbakja_production_machine' + - builder_table_update_romanah_gokbakja_production_machine_20.php +1.0.147: + - 'Updated table romanah_gokbakja_sewer_production' + - builder_table_update_romanah_gokbakja_sewer_production_13.php +1.0.148: + - 'Updated table romanah_gokbakja_sewer_production' + - builder_table_update_romanah_gokbakja_sewer_production_14.php +1.0.149: + - 'Updated table romanah_gokbakja_sewer_production' + - builder_table_update_romanah_gokbakja_sewer_production_15.php +1.0.150: + - 'Created table romanah_gokbakja_drobika' + - builder_table_create_romanah_gokbakja_drobika.php +1.0.151: + - 'Updated table romanah_gokbakja_drobika' + - builder_table_update_romanah_gokbakja_drobika.php +1.0.152: + - 'Updated table romanah_gokbakja_drobika' + - builder_table_update_romanah_gokbakja_drobika_2.php +1.0.153: + - 'Updated table romanah_gokbakja_drobika' + - builder_table_update_romanah_gokbakja_drobika_3.php diff --git a/themes/gokbakja/layouts/platform_main.htm b/themes/gokbakja/layouts/platform_main.htm index 015a890..b417f57 100644 --- a/themes/gokbakja/layouts/platform_main.htm +++ b/themes/gokbakja/layouts/platform_main.htm @@ -29,6 +29,7 @@ function onStart(){ $this["crudOrders"] = false; $this["rawActions"] = false; $this["journal"] = false; + $this["drobika"] = false; $filteredData = array_where($acceptPermissions, function ($permission) { return $permission['code'] == 'acceptDirector'; @@ -66,6 +67,10 @@ function onStart(){ return $permission9['code'] == 'journal'; }); + $filteredData10 = array_where($acceptPermissions, function ($permission10) { + return $permission10['code'] == 'drobika'; + }); + if($filteredData){ $this["isDirector"] = true; @@ -103,6 +108,10 @@ function onStart(){ $this["journal"] = true; } + if($filteredData10){ + $this["drobika"] = true; + } + } } ?> diff --git a/themes/gokbakja/meta/menus/aside.yaml b/themes/gokbakja/meta/menus/aside.yaml index cdbc007..40dd82c 100644 --- a/themes/gokbakja/meta/menus/aside.yaml +++ b/themes/gokbakja/meta/menus/aside.yaml @@ -461,4 +461,32 @@ items: isHidden: '0' cssClass: ri-chat-history-line isExternal: '0' + - + title: Drobika + type: cms-page + code: drobika + reference: drobika/new + viewBag: + isHidden: '0' + cssClass: ri-command-line + isExternal: '0' + items: + - + title: 'Täze Hasabat' + type: cms-page + code: drobika + reference: drobika/new + viewBag: + isHidden: '0' + cssClass: '' + isExternal: '0' + - + title: Hasabat + type: cms-page + code: drobika + reference: drobika/report + viewBag: + isHidden: '0' + cssClass: '' + isExternal: '0' name: aside diff --git a/themes/gokbakja/pages/drobika/new.htm b/themes/gokbakja/pages/drobika/new.htm new file mode 100644 index 0000000..f064b2d --- /dev/null +++ b/themes/gokbakja/pages/drobika/new.htm @@ -0,0 +1,228 @@ +title = "drobika/new" +url = "/drobika/new" +layout = "platform_main" +is_hidden = 0 + +[drobika] +== +orderBy('id', 'desc')->get(); + +} +?> +== +{% put styles %} + + + + + +{% endput %} + +
+
+ {% if crudSewerProduction %} +
+
+
+ +
+
+
+
+ + +
+ +
+ + +
+ + +
+ +
+ + + +
+
+ +
+
+ + + +
+
+ +
+
+ + + +
+
+ + +
+
+ + + +
+
+ + +
+ +
+ +
+
+
+ +
+
+
+ {% endif %} +
+ +
+
+
+
+
+
+

Drobika Enjamy

+

Hasabaty

+
+
+ {% if crudSewerProduction %} + + {% endif %} +
+
+ + + + + + + + + + + + + + + + + + + + {% for key, drobika in drobika %} + + + + + + + + + + + + {% endfor %} + + + + + + + + + + + + + + + +
NoÇig malSmenSeneGoýulan mukdar (kg)Önen Mukdar (kg)BellikSazlamalar
{{key+1}}{{drobika.product.code}}{{drobika.shift.desc}}{{drobika.date|date('d.m.Y')}}{{drobika.amount|number_format}} kg {{drobika.produced_weight|number_format}} kg{{drobika.note}} + +
NoÇig malSmenSeneGoýulan mukdarÖnen MukdarBellikSazlamalar
+
+ + + +
+
+
+
+ +{% put scripts %} + + + + + +{% endput %} +{% partial 'dataTableJs' %} diff --git a/themes/gokbakja/pages/drobika/report.htm b/themes/gokbakja/pages/drobika/report.htm new file mode 100644 index 0000000..f00d72c --- /dev/null +++ b/themes/gokbakja/pages/drobika/report.htm @@ -0,0 +1,158 @@ +title = "drobika/report" +url = "/drobika/report" +layout = "platform_main" +is_hidden = 0 + +[drobika] +== + +== +{% put styles %} + + + + + +{% endput %} + + +
+
+
+
+
+
+
+
+ + +
+ +
+ + +
+ + +
+
+ + +
+ + +
+
+
+ + +
+
+ + + +
+
+ + +
+ +
+ +
+
+ +
+
+
+ +
+
+ + +
+
+
+
+
+
+
+

Drobika Boýunça Umumy

+

Hasabat

+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NoÇig malSmenSeneGoýulan mukdar (kg)Önen Mukdar (kg)Bellik
NoÇig malSmenSeneGoýulan mukdarÖnen MukdarBellik
+
+ + + +
+
+
+
+ + +{% partial 'dataTableJs' %} +{% put scripts %} + + + +{% endput %} diff --git a/themes/gokbakja/pages/sewer/new.htm b/themes/gokbakja/pages/sewer/new.htm index 0dff629..c148672 100644 --- a/themes/gokbakja/pages/sewer/new.htm +++ b/themes/gokbakja/pages/sewer/new.htm @@ -21,6 +21,7 @@ function onStart(){ }]) ->where("stock_id", $stockId) ->addSelect(DB::raw("SUM(amount) as quantity")) + ->having('quantity', '>', 0) ->groupBy('romanah_gokbakja_rulon_action.product_id') ->orderBy('id', 'DESC') ->get(); @@ -49,6 +50,15 @@ function onStart(){
+
+ + +
+
@@ -157,7 +168,7 @@ function onStart(){
-

Halta Tikýän Staboklar

+

Halta Tikýän Stanoklar

Hasabaty

@@ -192,10 +203,8 @@ function onStart(){ Rulon Görnüş Çig mal mukdary Halta Görnüş - Stanok Gram - Halta (arassa) BRAK Halta Sürülmedik @@ -254,5 +263,20 @@ function onStart(){ + + + {% endput %} -{% partial 'dataTableJs' %} +{% partial 'dataTableJs' %} \ No newline at end of file