diff --git a/plugins/romanah/gokbakja/components/MachineProduction.php b/plugins/romanah/gokbakja/components/MachineProduction.php index 00dc683..0ef72b9 100644 --- a/plugins/romanah/gokbakja/components/MachineProduction.php +++ b/plugins/romanah/gokbakja/components/MachineProduction.php @@ -34,17 +34,19 @@ class MachineProduction extends ComponentBase $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(); + $machineProductions = ProductionMachineModel::with(['bag_type', 'bag_size', 'machine.building', 'employee', 'mechanic', 'color'])->orderBy('id', 'DESC')->get(); $html_data = ''; for ($x = 0; $x < count($machineProductions); $x++) { // dd($machineProductions[0]->bag_size); $html_data .= ' ' . ($x + 1) . ' + ' . ($machineProductions[$x]->date == null ? "" : Carbon::parse($machineProductions[$x]->date)->format('d.m.Y')) . ' ' . $machineProductions[$x]->building_name . ' ' . $machineProductions[$x]->machine->name . ' ' . $machineProductions[$x]->bag_size->name . ' ' . $machineProductions[$x]->bag_type->name . ' + ' . ($machineProductions[$x]->color->name ?? "") . ' ' . number_format($machineProductions[$x]->produced_weight) . ' kg @@ -66,10 +68,10 @@ class MachineProduction extends ComponentBase $data = post(); - $machineProductions = ProductionMachineModel::with(['bag_type', 'bag_size', 'machine.building', 'employee', 'mechanic'])->orderBy('id', 'DESC'); + $machineProductions = ProductionMachineModel::with(['bag_type', 'bag_size', 'machine.building', 'employee', 'mechanic', 'color'])->orderBy('id', 'DESC'); $start = Carbon::parse($data["start"])->format('Y-m-d'); - $end = Carbon::parse($data["end"])->format('Y-m-d');; + $end = Carbon::parse($data["end"])->format('Y-m-d'); $machine = $data["machine_id"]; $mechanic = $data["mechanic_id"]; $size = $data["size_id"]; @@ -93,7 +95,7 @@ class MachineProduction extends ComponentBase } if ($start != $currentDateFormat){ - $machineProductions->whereBetween('created_at', [$start, $end]); + $machineProductions->whereBetween('date', [$start, $end]); } $machineProductionsFiltered = $machineProductions->get(); @@ -152,8 +154,10 @@ class MachineProduction extends ComponentBase $createProductionMachine->type_id = $data["type_id"]; $createProductionMachine->size_id = $data["size_id"]; $createProductionMachine->machine_id = $data["machine_id"]; + $createProductionMachine->color_id = $data["color_id"]; $createProductionMachine->produced_weight = $data["produced_weight"]; $createProductionMachine->note = $data["note"]; + $createProductionMachine->date = Carbon::parse($data["date"])->format('Y-m-d'); $createProductionMachine->user_id = $user->id; $createProductionMachine->save(); @@ -172,17 +176,19 @@ class MachineProduction extends ComponentBase $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(); + $machineProductions = ProductionMachineModel::with(['bag_type', 'bag_size', 'machine.building', 'employee', 'mechanic', 'color'])->orderBy('id', 'DESC')->get(); $html_data = ''; for ($x = 0; $x < count($machineProductions); $x++) { $html_data .= ' ' . ($x + 1) . ' + ' . ($machineProductions[$x]->date == null ? "" : Carbon::parse($machineProductions[$x]->date)->format('d.m.Y')) . ' ' . $machineProductions[$x]->building_name . ' ' . $machineProductions[$x]->machine->name . ' ' . $machineProductions[$x]->bag_size->name . ' ' . $machineProductions[$x]->bag_type->name . ' + ' . ($machineProductions[$x]->color->name ?? "") . ' ' . number_format($machineProductions[$x]->produced_weight) . ' kg diff --git a/plugins/romanah/gokbakja/components/Order.php b/plugins/romanah/gokbakja/components/Order.php index 4f729bc..a00b0fa 100644 --- a/plugins/romanah/gokbakja/components/Order.php +++ b/plugins/romanah/gokbakja/components/Order.php @@ -292,14 +292,14 @@ class Order extends ComponentBase for ($x = 0; $x < count($paymentDatas); $x++) { // dd($orderDatas[$x]->shipping->status); $html_data .= ' - ' . ($x + 1) . ' - ' . $paymentDatas[$x]->amount . ' $ - ' . $paymentDatas[$x]->created_at->format('d.m.Y') . ' - ' . $paymentDatas[$x]->note . ' - Täzele - '; + ' . ($x + 1) . ' + ' . $paymentDatas[$x]->amount . ' $ + ' . ($paymentDatas[$x]->date == null ? "" : Carbon::parse($paymentDatas[$x]->date)->format('d.m.Y')) . ' + ' . $paymentDatas[$x]->note . ' + Täzele + '; } $order = OrderModel::where("id", $orderId)->with(["client", "shipping"]) @@ -387,6 +387,7 @@ class Order extends ComponentBase $createPayment = new PaymentModel(); + $createPayment->date = Carbon::parse($data["date"])->format('Y-m-d'); $createPayment->amount = $data["amount"]; $createPayment->note = $data["note"]; $createPayment->order_id = $orderId; @@ -401,7 +402,7 @@ class Order extends ComponentBase $html_data .= ' ' . ($x + 1) . ' ' . $paymentDatas[$x]->amount . ' $ - ' . $paymentDatas[$x]->created_at->format('d.m.Y') . ' + ' . ($paymentDatas[$x]->date == null ? "" : Carbon::parse($paymentDatas[$x]->date)->format('d.m.Y')) . ' ' . $paymentDatas[$x]->note . ' param("excruiter"); - - $currentDateLast = ProductionModel::whereDate('created_at', date($currentDateFormat))->where('excruiter_id', $excruiter)->with("excruiter")->orderBy('id', 'DESC')->first(); - $currentDateFirst = ProductionModel::whereDate('created_at', date($currentDateFormat))->where('excruiter_id', $excruiter)->orderBy('id', 'ASC')->first(); + $currentExcrutier = ExcruiterModel::where("id", $excruiter)->first(); $productionsCalc = ProductionModel::orderBy('id', 'DESC'); - $calc = $productionsCalc->select(DB::raw('MAX(all_amount) - MIN(all_amount) AS amount_subtraction'), DB::raw('MAX(all_amount) AS max_amount'), DB::raw('MIN(all_amount) AS min_amount'), DB::raw('MAX(time) AS max_time'), DB::raw('MIN(time) AS min_time')) - ->whereDate('created_at', date($currentDateFormat))->where('excruiter_id', $excruiter)->first(); + $calc = $productionsCalc->select(DB::raw('MAX(time) AS max_time'), DB::raw('MIN(time) AS min_time')) + ->whereDate('date', date($currentDateFormat))->where('excruiter_id', $excruiter)->first(); $diffMinutes = Carbon::parse($calc->max_time)->diffInMinutes($calc->min_time); - // $calcTimeDiff = floor($diffMinutes / 60) . ' sagat ' . ($diffMinutes - floor($diffMinutes / 60) * 60) . ' minut'; + $timeCalc = floor($diffMinutes / 60) . ' sagat ' . ($diffMinutes - floor($diffMinutes / 60) * 60) . ' minut'; + $countDailyChanges = ProductionModel::whereDate('date', date($currentDateFormat))->where('excruiter_id', $excruiter)->get(); - // $diffMinutes = Carbon::parse($currentDateLast->time)->diffInMinutes($currentDateFirst->time); - - $currentDateProductionAll = ProductionModel::whereDate('created_at', date($currentDateFormat))->where('excruiter_id', $excruiter)->avg('all_amount'); - - - // $testq = PivotProductionModel::whereDate('created_at', date($currentDateFormat)) - // ->where('excruiter_id', $excruiter) - // ->select('id', 'product_name', 'excruiter_id',DB::raw('round(AVG(amount),0) as average'), DB::raw('round(AVG(amount_percentage),0) as average_percentage')) - // ->groupBy('product_id') - // ->get(); - - $pivotFirsts = PivotProductionModel::where('production_id', $currentDateFirst->id)->get(); - $pivotLasts = PivotProductionModel::where('production_id', $currentDateLast->id)->get(); - - - - $allData = array( - "all" => array( - "hours" => floor($diffMinutes / 60) . ' sagat ' . ($diffMinutes - floor($diffMinutes / 60) * 60) . ' minut', - "avg_all_amount" => number_format($currentDateProductionAll, 2), - ) - ); - - $producedAll = $calc->amount_subtraction; - - $countDailyChanges = ProductionModel::whereDate('created_at', date($currentDateFormat))->where('excruiter_id', $excruiter)->get(); - + $products = ProductModel::where('report', 'simple')->get(); // dd(count($countDailyChanges)); if (count($countDailyChanges) > 1) { + + $dailyCalculated = ProductionCalculateModel::whereDate("date", date($currentDateFormat))->where("excruiter_id", $excruiter)->sum("amount_calc"); + + //sagatda ortacaha hasaplama + $html_data2 =''; + // gunluk hasabat $html_data = '
'; - $html_data .= '

JEMI IŞLENEN ÇIG MAL (ekskruiter: ' . $currentDateLast->excruiter->name . ')

'; + $html_data .= '

JEMI IŞLENEN ÇIG MAL (ekskruiter: ' . $currentExcrutier->name . ')

'; $html_data .= '
' . $allData["all"]["hours"] . '
+ class="mdi mdi-bullseye-arrow me-3">' . $timeCalc. '
-

JEMI IŞLENEN: ' . $producedAll . ' kg

+

JEMI IŞLENEN: ' . $dailyCalculated . ' kg
'; - for ($x = 0; $x < count($pivotLasts); $x++) { - // $diff = $pivotLasts[$x]->amount - $pivotFirsts[$x]->amount; - // $diffPerc = ($diff * 100) / $producedAll; - $calculatedPercentage = (float) ($pivotLasts[$x]->amount_percentage / 100) * (float) $producedAll; - $html_data .= '
- -
-
' . ($calculatedPercentage) . ' kg
-
-

' . $pivotLasts[$x]->product_name . ' : ' . ($pivotLasts[$x]->amount_percentage) . ' %

-
- -
'; - } - - $html_data .= '
'; - - $hourCount = floor($diffMinutes / 60) . '.' . ($diffMinutes - floor($diffMinutes / 60) * 60); - $avgProducedHour = $producedAll / $hourCount; - - - - // sagatda ortacha hasbat - $html_data2 = '
'; - $html_data2 .= '

SAGATDA ORTAÇA SARP EDIŞ HASABATY (ekskruiter: ' . $currentDateLast->excruiter->name . ')

'; + //sagatda ortacaha hasaplama + $html_data2 .= '
'; + $html_data2 .= '

SAGATDA ORTAÇA (ekskruiter: ' . $currentExcrutier->name . ')

'; $html_data2 .= '
' . $allData["all"]["hours"] . '
+ class="mdi mdi-bullseye-arrow me-3">' . $timeCalc. '
-

Sagatda Ortaça: ' . (number_format($avgProducedHour, 2)) . ' kg

+

SAGATDA ORTAÇA: ' . number_format($dailyCalculated / floor($diffMinutes / 60), 2) . ' kg
'; - for ($x = 0; $x < count($pivotLasts); $x++) { + + for ($x = 0; $x < count($products); $x++) { + + $productCalc = ProductionCalculateModel::whereDate('date', date($currentDateFormat))->where('excruiter_id', $excruiter)->where("product_id", $products[$x]->id)->sum('amount_calc'); + + $productCalcPercentage = ProductionCalculateModel::whereDate('date', date($currentDateFormat))->where('excruiter_id', $excruiter)->where("product_id", $products[$x]->id)->orderBy('id', 'DESC')->first(); // $diff = $pivotLasts[$x]->amount - $pivotFirsts[$x]->amount; // $diffPerc = ($diff * 100) / $producedAll; - $calculatedPercentage = (float) ($pivotLasts[$x]->amount_percentage / 100) * (float) $producedAll; - $calculatePercentageHour = (float) (($calculatedPercentage / $hourCount) * 100) / (float) $producedAll; - $html_data2 .= '
+ $html_data .= '
-
Sagatda: ' . (number_format(($calculatedPercentage / $hourCount), 2)) . ' kg
+
' . ($productCalc) . ' kg
-

' . $pivotLasts[$x]->product_name . ' : ' . (number_format($calculatePercentageHour, 2)) . ' %

+

' . $products[$x]->name . ' : ' . ($productCalcPercentage->amount_percentage) . ' %
'; + + + $html_data2 .= '
+ +
+
' . number_format($productCalc / floor($diffMinutes / 60), 2) . ' kg
+
+

' . $products[$x]->name . ' : ' . ($productCalcPercentage->amount_percentage) . ' %

+
+ +
'; + + } + $html_data .= '
'; $html_data2 .= '
'; - $html_data3 = ''; + //ekstrudorlar b-ca + $excruiters = ExcruiterModel::get(); - $currentDateExcruiters = ProductionModel::whereDate('created_at', date($currentDateFormat))->groupBy("excruiter_id")->orderBy('id', 'DESC')->with("excruiter")->get(); - - - - for ($i = 0; $i < count($currentDateExcruiters); $i++) { - - $currentDateLastExc = ProductionModel::whereDate('created_at', date($currentDateFormat))->where('excruiter_id', $currentDateExcruiters[$i]->excruiter_id)->orderBy('id', 'DESC')->first(); - - // $currentDateFirstExc = ProductionModel::whereDate('created_at', date($currentDateFormat))->where('excruiter_id', $currentDateExcruiters[$i]->excruiter_id)->orderBy('id', 'ASC')->first(); - - ///////////// + $html_data3 = '
'; + for ($x = 0; $x < count($excruiters); $x++) { $productionsCalc = ProductionModel::orderBy('id', 'DESC'); + $calc = $productionsCalc->select(DB::raw('MAX(time) AS max_time'), DB::raw('MIN(time) AS min_time')) + ->whereDate('date', date($currentDateFormat))->where('excruiter_id', $excruiters[$x]->id)->first(); - $calc = $productionsCalc->select(DB::raw('MAX(all_amount) - MIN(all_amount) AS amount_subtraction'), DB::raw('MAX(all_amount) AS max_amount'), DB::raw('MIN(all_amount) AS min_amount'), DB::raw('MAX(time) AS max_time'), DB::raw('MIN(time) AS min_time')) - ->whereDate('created_at', date($currentDateFormat))->where('excruiter_id', $currentDateExcruiters[$i]->excruiter_id)->first(); + $diffMinutes = Carbon::parse($calc->max_time)->diffInMinutes($calc->min_time); - $diffMinutesExc = Carbon::parse($calc->max_time)->diffInMinutes($calc->min_time); + $timeCalc = floor($diffMinutes / 60) . ' sagat ' . ($diffMinutes - floor($diffMinutes / 60) * 60) . ' minut'; - ///////////// + $productCalc = ProductionCalculateModel::whereDate('date', date($currentDateFormat))->where('excruiter_id', $excruiters[$x]->id)->sum('amount_calc'); - // $diffMinutesExc = Carbon::parse($currentDateLastExc->time)->diffInMinutes($currentDateFirstExc->time); - - $hourCountExc = floor($diffMinutesExc / 60) . ' sagat ' . ($diffMinutesExc - floor($diffMinutesExc / 60) * 60) . ' minut'; - - $allAmountExc = $calc->amount_subtraction; - - // dd($currentDateFirstExc); - $html_data3 .= '
'; - $html_data3 .= '

' . $currentDateExcruiters[$i]->excruiter->name . ' - işlenen çig mallar boýunça.

'; + $html_data3 .= '

JEMI IŞLENEN ÇIG MAL (ekskruiter: ' . $excruiters[$x]->name . ')

'; $html_data3 .= '
- -
-
' . $hourCountExc . '
-
-

Jemi Işlenen: ' . (number_format($allAmountExc)) . ' kg

-
- -
'; + +
+
' . $timeCalc. '
+
+

JEMI IŞLENEN: ' . $dailyCalculated . ' kg

+
+ +
'; - $excruiterDatas = PivotProductionModel::where('production_id', $currentDateLastExc->id)->get(); - // $pivotLasts = PivotProductionModel::where('production_id', $currentDateLast->id)->get(); + for ($i = 0; $i < count($products); $i++) { - // \Log::info($excruiterDatas); - for ($ii = 0; $ii < count($excruiterDatas); $ii++) { - // $diff = $pivotLasts[$x]->amount - $pivotFirsts[$x]->amount; - // $diffPerc = ($diff * 100) / $producedAll; - $calculatedPercentage = (float) ($excruiterDatas[$ii]->amount_percentage / 100) * (float) $allAmountExc; + $productCalc = ProductionCalculateModel::whereDate('date', date($currentDateFormat))->where('excruiter_id', $excruiters[$x]->id)->where("product_id", $products[$i]->id)->sum('amount_calc'); + + $productCalcPercentage = ProductionCalculateModel::whereDate('date', date($currentDateFormat))->where('excruiter_id', $excruiters[$x]->id)->where("product_id", $products[$i]->id)->orderBy('id', 'DESC')->first(); $html_data3 .= '
- -
-
' . ($calculatedPercentage) . ' kg
-
-

' . $excruiterDatas[$ii]->product_name . ' : ' . ($excruiterDatas[$ii]->amount_percentage) . ' %

-
- -
'; + +
+
' . ($productCalc) . ' kg
+
+

' . $products[$i]->name . ' : ' . ($productCalcPercentage->amount_percentage ?? 0) . ' %

+
+ +
'; + + } - $html_data3 .= '
'; + } - - // } + $html_data3 .= ''; - - - - - $currentDateShifts = ProductionModel::whereDate('created_at', date($currentDateFormat)) - // ->where("excruiter_id", $excruiter) - ->with(["shift", "excruiter", "pivot_production"]) - ->groupBy("shift_id", "excruiter_id") - // ->max("id") - ->orderBy('excruiter_id', 'DESC') - // ->distinct() - ->get(); - - // dd($currentDateShifts); - // $products = ProductModel::where("report", "simple")->get(); + //smenlar boyuncha + $shifts = ShiftModel::get(); $html_data4 = '

SMENLAR BOÝUNÇA

'; + $html_data4 .= '
'; $html_data4 .= ' - - - '; - // for ($ii = 0; $ii < count($currentDateShifts[0]->pivot_production); $ii++) { - // $html_data4 .= ''; - // } + '; + $html_data4 .= ''; + $sumTimeDiffs = 0; + $productAllCalc = 0; + for ($i = 0; $i < count($shifts); $i++) { - for ($i = 0; $i < count($currentDateShifts); $i++) { - - $productionsCalc = ProductionModel::orderBy('id', 'DESC')->whereDate('created_at', date($currentDateFormat)); - - $calc = $productionsCalc->select(DB::raw('MAX(all_amount) - MIN(all_amount) AS amount_subtraction'), DB::raw('MAX(all_amount) AS max_amount'), DB::raw('MIN(all_amount) AS min_amount'), DB::raw('MAX(time) AS max_time'), DB::raw('MIN(time) AS min_time')) - ->where('shift_id', $currentDateShifts[$i]->shift_id)->where('excruiter_id', $currentDateShifts[$i]->excruiter_id)->first(); + $productionsCalc = ProductionModel::orderBy('id', 'DESC'); + $calc = $productionsCalc->select(DB::raw('MAX(time) AS max_time'), DB::raw('MIN(time) AS min_time')) + ->whereDate('date', date($currentDateFormat))->where('shift_id', $shifts[$i]->id)->first(); $diffMinutes = Carbon::parse($calc->max_time)->diffInMinutes($calc->min_time); - $hourCountShift = floor($diffMinutes / 60) . ' sagat ' . ($diffMinutes - floor($diffMinutes / 60) * 60) . ' minut'; + $sumTimeDiffs += $diffMinutes; + + $timeCalc = floor($diffMinutes / 60) . ' sagat ' . ($diffMinutes - floor($diffMinutes / 60) * 60) . ' minut'; + + $productCalc = ProductionCalculateModel::whereDate('date', date($currentDateFormat))->where('shift_id', $shifts[$i]->id)->sum('amount_calc'); + + $productAllCalc += $productCalc; $html_data4 .= ' - - - - '; - - - // for ($x = 0; $x < count($pivotShiftLasts); $x++) { - - // $calculatedPercentageShift = (float) ($pivotShiftLasts[$x]->amount_percentage / 100) * (float) $allAmountShift; - - // $html_data4 .= ''; - // } - + + + '; $html_data4 .= ''; } - $html_data4 .= ' + $timeAllCalc = floor($sumTimeDiffs / 60) . ' sagat ' . ($sumTimeDiffs - floor($sumTimeDiffs / 60) * 60) . ' minut'; - '; + $html_data4 .= ' + + + + '; + $html_data4 .= ''; $html_data4 .= '
# SmenEkskruiter WagtyJemi' . $currentDateShifts[0]->pivot_production[$ii]->product_name . 'Jemi
' . ($i + 1) . '' . $currentDateShifts[$i]->shift->desc . '(' . $currentDateShifts[$i]->shift->start . ' - ' . $currentDateShifts[$i]->shift->end . ')' . $currentDateShifts[$i]->excruiter->name . '' . $hourCountShift . '' . $calc->amount_subtraction . ' kg' . ($calculatedPercentageShift) . ' kg ' . $shifts[$i]->desc . '(' . $shifts[$i]->start . ' - ' . $shifts[$i]->end . ')'.$timeCalc.'' . $productCalc . ' kg
JEMI'.$timeAllCalc.'' . $productAllCalc . ' kg
'; + return [ '#calculation_of_day' => $html_data, '#avg_of_day' => $html_data2, @@ -431,6 +376,8 @@ class Production extends ComponentBase + + function onCalculateAvg() { $currentDate = Carbon::now()->timezone('UTC +05:00'); @@ -520,7 +467,7 @@ class Production extends ComponentBase $excruiter = $this->param("excruiter"); if ($excruiter == 0) { - Flash::error("Ekskruiter Saýla!"); + Flash::error("Ekstrudor Saýla!"); return Redirect::refresh(); } else { $createProduction = new ProductionModel(); @@ -528,8 +475,8 @@ class Production extends ComponentBase $createProduction->all_amount = $data["all_amount"]; $createProduction->note = $data["note"]; $createProduction->user_id = $user->id; - $createProduction->date = $currentDate->format('Y-m-d'); - $createProduction->time = $currentDate->format('H:i:s'); + $createProduction->date = Carbon::parse($data["date"])->format('Y-m-d'); + $createProduction->time = Carbon::parse($data["time"])->format('H:i:s'); $createProduction->excruiter_id = $excruiter; $createProduction->shift_id = $data["shift_id"]; $createProduction->save(); @@ -548,15 +495,46 @@ class Production extends ComponentBase $createProduction->excruiter_id = $excruiter; $createPivotProduction->amount = (float)(((float) $data[$fieldName] ?? 0) / 100) * ((float) $createProduction->all_amount); - $createPivotProduction->date = $currentDate->format('Y-m-d'); - $createPivotProduction->time = $currentDate->format('H:i:s'); + $createPivotProduction->date = Carbon::parse($data["date"])->format('Y-m-d'); + $createPivotProduction->time = Carbon::parse($data["time"])->format('H:i:s'); $createPivotProduction->save(); } + + $todayProductionsCount = ProductionModel::whereDate('date', date($createProduction->date))->where("excruiter_id", $excruiter)->count(); + + if($todayProductionsCount > 1){ + $todayProductionsGet = ProductionModel::whereDate('date', date($createProduction->date))->where("excruiter_id", $excruiter)->orderBy("id", "DESC")->skip(1)->first(); + + $productionPivots = PivotProductionModel::where('production_id', $todayProductionsGet->id)->get(); + + $diffAllAmount = ($createProduction->all_amount - $todayProductionsGet->all_amount); + + for ($x = 0; $x < count($productionPivots); $x++) { + + + $createCalculate = new ProductionCalculateModel(); + $createCalculate->production_id = $todayProductionsGet->id; + $createCalculate->product_id = $productionPivots[$x]->product_id; + $createCalculate->amount_calc = (float)(((float) $productionPivots[$x]->amount_percentage ?? 0) / 100) * ((float) $diffAllAmount); + $createCalculate->excruiter_id = $todayProductionsGet->excruiter_id; + $createCalculate->shift_id = $todayProductionsGet->shift_id; + $createCalculate->amount_percentage = $productionPivots[$x]->amount_percentage; + + $createCalculate->date = $productionPivots[$x]->date; + $createCalculate->time = $productionPivots[$x]->time; + + $createCalculate->save(); + } + + } + + if ($createProduction && $createPivotProduction) { Flash::success("Hasabat Ustunlikli Goşuldy"); return Redirect::refresh(); } + } } @@ -605,4 +583,5 @@ class Production extends ComponentBase // } + } diff --git a/plugins/romanah/gokbakja/controllers/BagColor.php b/plugins/romanah/gokbakja/controllers/BagColor.php new file mode 100644 index 0000000..df8e7ec --- /dev/null +++ b/plugins/romanah/gokbakja/controllers/BagColor.php @@ -0,0 +1,18 @@ + + + + diff --git a/plugins/romanah/gokbakja/controllers/bagcolor/config_form.yaml b/plugins/romanah/gokbakja/controllers/bagcolor/config_form.yaml new file mode 100644 index 0000000..52d2951 --- /dev/null +++ b/plugins/romanah/gokbakja/controllers/bagcolor/config_form.yaml @@ -0,0 +1,10 @@ +name: BagColor +form: $/romanah/gokbakja/models/bagcolor/fields.yaml +modelClass: Romanah\Gokbakja\Models\BagColor +defaultRedirect: romanah/gokbakja/bagcolor +create: + redirect: 'romanah/gokbakja/bagcolor/update/:id' + redirectClose: romanah/gokbakja/bagcolor +update: + redirect: romanah/gokbakja/bagcolor + redirectClose: romanah/gokbakja/bagcolor diff --git a/plugins/romanah/gokbakja/controllers/bagcolor/config_list.yaml b/plugins/romanah/gokbakja/controllers/bagcolor/config_list.yaml new file mode 100644 index 0000000..99a78e9 --- /dev/null +++ b/plugins/romanah/gokbakja/controllers/bagcolor/config_list.yaml @@ -0,0 +1,12 @@ +list: $/romanah/gokbakja/models/bagcolor/columns.yaml +modelClass: Romanah\Gokbakja\Models\BagColor +title: BagColor +noRecordsMessage: 'backend::lang.list.no_records' +showSetup: true +showCheckboxes: true +recordsPerPage: 20 +toolbar: + buttons: list_toolbar + search: + prompt: 'backend::lang.list.search_prompt' +recordUrl: 'romanah/gokbakja/bagcolor/update/:id' diff --git a/plugins/romanah/gokbakja/controllers/bagcolor/create.htm b/plugins/romanah/gokbakja/controllers/bagcolor/create.htm new file mode 100644 index 0000000..047b305 --- /dev/null +++ b/plugins/romanah/gokbakja/controllers/bagcolor/create.htm @@ -0,0 +1,46 @@ + + + + +fatalError): ?> + + 'layout']) ?> + +
+ formRender() ?> +
+ +
+
+ + + + + +
+
+ + + + +

fatalError)) ?>

+

+ \ No newline at end of file diff --git a/plugins/romanah/gokbakja/controllers/bagcolor/index.htm b/plugins/romanah/gokbakja/controllers/bagcolor/index.htm new file mode 100644 index 0000000..ea43a36 --- /dev/null +++ b/plugins/romanah/gokbakja/controllers/bagcolor/index.htm @@ -0,0 +1 @@ +listRender() ?> diff --git a/plugins/romanah/gokbakja/controllers/bagcolor/preview.htm b/plugins/romanah/gokbakja/controllers/bagcolor/preview.htm new file mode 100644 index 0000000..964fcaf --- /dev/null +++ b/plugins/romanah/gokbakja/controllers/bagcolor/preview.htm @@ -0,0 +1,22 @@ + + + + +fatalError): ?> + +
+ formRenderPreview() ?> +
+ + +

fatalError) ?>

+ + +

+ + + +

\ No newline at end of file diff --git a/plugins/romanah/gokbakja/controllers/bagcolor/update.htm b/plugins/romanah/gokbakja/controllers/bagcolor/update.htm new file mode 100644 index 0000000..4463917 --- /dev/null +++ b/plugins/romanah/gokbakja/controllers/bagcolor/update.htm @@ -0,0 +1,54 @@ + + + + +fatalError): ?> + + 'layout']) ?> + +
+ formRender() ?> +
+ +
+
+ + + + + + + +
+
+ + + +

fatalError)) ?>

+

+ \ No newline at end of file diff --git a/plugins/romanah/gokbakja/models/BagColor.php b/plugins/romanah/gokbakja/models/BagColor.php new file mode 100644 index 0000000..d3c484a --- /dev/null +++ b/plugins/romanah/gokbakja/models/BagColor.php @@ -0,0 +1,33 @@ + [ + 'Romanah\Gokbakja\Models\ProductionMachine', + 'key' => 'color_id' + ] + ]; + /** + * @var string The database table used by the model. + */ + public $table = 'romanah_gokbakja_bag_color'; + + /** + * @var array Validation rules + */ + public $rules = [ + ]; +} diff --git a/plugins/romanah/gokbakja/models/ProductionCalculate.php b/plugins/romanah/gokbakja/models/ProductionCalculate.php new file mode 100644 index 0000000..14b5358 --- /dev/null +++ b/plugins/romanah/gokbakja/models/ProductionCalculate.php @@ -0,0 +1,45 @@ + [ + 'Romanah\Gokbakja\Models\Production', + 'key' => 'production_id' + ], + 'product' => [ + 'Romanah\Gokbakja\Models\Product', + 'key' => 'product_id' + ], + 'excruiter' => [ + 'Romanah\Gokbakja\Models\Excruiter', + 'key' => 'excruiter_id' + ], + 'shift' => [ + 'Romanah\Gokbakja\Models\Shift', + 'key' => 'shift_id' + ] + ]; + + /** + * @var string The database table used by the model. + */ + public $table = 'romanah_gokbakja_production_calculate'; + + /** + * @var array Validation rules + */ + public $rules = [ + ]; +} diff --git a/plugins/romanah/gokbakja/models/ProductionMachine.php b/plugins/romanah/gokbakja/models/ProductionMachine.php index 64acaaa..32ed8ac 100644 --- a/plugins/romanah/gokbakja/models/ProductionMachine.php +++ b/plugins/romanah/gokbakja/models/ProductionMachine.php @@ -11,7 +11,7 @@ class ProductionMachine extends Model use \October\Rain\Database\Traits\SoftDelete; - protected $dates = ['deleted_at']; + protected $dates = ['deleted_at', 'date']; public $belongsTo = [ 'bag_type' => [ @@ -34,6 +34,10 @@ class ProductionMachine extends Model 'Romanah\Gokbakja\Models\Employee', 'key' => 'mechanic_id' ], + 'color' => [ + 'Romanah\Gokbakja\Models\BagColor', + 'key' => 'color_id' + ], ]; /** diff --git a/plugins/romanah/gokbakja/models/bagcolor/columns.yaml b/plugins/romanah/gokbakja/models/bagcolor/columns.yaml new file mode 100644 index 0000000..f246360 --- /dev/null +++ b/plugins/romanah/gokbakja/models/bagcolor/columns.yaml @@ -0,0 +1,14 @@ +columns: + id: + label: id + type: number + name: + label: 'Renk Ady' + type: text + searchable: true + sortable: true + note: + label: Bellik + type: text + searchable: true + sortable: true diff --git a/plugins/romanah/gokbakja/models/bagcolor/fields.yaml b/plugins/romanah/gokbakja/models/bagcolor/fields.yaml new file mode 100644 index 0000000..dadf6cc --- /dev/null +++ b/plugins/romanah/gokbakja/models/bagcolor/fields.yaml @@ -0,0 +1,10 @@ +fields: + name: + label: 'Rulon Renk Ady' + span: auto + type: text + note: + label: Bellik + span: auto + size: '' + type: textarea diff --git a/plugins/romanah/gokbakja/models/bagsize/columns.yaml b/plugins/romanah/gokbakja/models/bagsize/columns.yaml index 628d517..1acba74 100644 --- a/plugins/romanah/gokbakja/models/bagsize/columns.yaml +++ b/plugins/romanah/gokbakja/models/bagsize/columns.yaml @@ -3,10 +3,10 @@ columns: label: id type: number width: - label: width + label: 'Rulon Ini' type: text height: - label: height + label: 'Rulon Uzynlygy' type: text name: label: name diff --git a/plugins/romanah/gokbakja/models/bagsize/fields.yaml b/plugins/romanah/gokbakja/models/bagsize/fields.yaml index 384b085..d4e73ba 100644 --- a/plugins/romanah/gokbakja/models/bagsize/fields.yaml +++ b/plugins/romanah/gokbakja/models/bagsize/fields.yaml @@ -1,16 +1,12 @@ fields: width: - label: 'Halta Ini' + label: 'Rulon Ini' span: auto type: number height: - label: 'Halta uzynlygy' + label: 'Rulon uzynlygy m2' span: auto type: number - name: - label: Ady - span: auto - type: text note: label: Bellik span: auto diff --git a/plugins/romanah/gokbakja/models/bagtype/fields.yaml b/plugins/romanah/gokbakja/models/bagtype/fields.yaml index 416749b..e1b8398 100644 --- a/plugins/romanah/gokbakja/models/bagtype/fields.yaml +++ b/plugins/romanah/gokbakja/models/bagtype/fields.yaml @@ -1,6 +1,6 @@ fields: name: - label: 'Halta Görnüşiniň Ady' + label: 'Rulon Görnüşiniň Ady' span: auto type: text note: diff --git a/plugins/romanah/gokbakja/models/payment/columns.yaml b/plugins/romanah/gokbakja/models/payment/columns.yaml index 9b4eac4..f200c18 100644 --- a/plugins/romanah/gokbakja/models/payment/columns.yaml +++ b/plugins/romanah/gokbakja/models/payment/columns.yaml @@ -11,3 +11,6 @@ columns: note: label: note type: text + date: + label: Sene + type: datetime diff --git a/plugins/romanah/gokbakja/models/payment/fields.yaml b/plugins/romanah/gokbakja/models/payment/fields.yaml index 3d66f97..5ffff6e 100644 --- a/plugins/romanah/gokbakja/models/payment/fields.yaml +++ b/plugins/romanah/gokbakja/models/payment/fields.yaml @@ -13,3 +13,8 @@ fields: label: Note span: auto type: textarea + date: + label: Sene + span: auto + mode: date + type: datepicker diff --git a/plugins/romanah/gokbakja/models/productionmachine/fields.yaml b/plugins/romanah/gokbakja/models/productionmachine/fields.yaml index 4e9a3cf..879651c 100644 --- a/plugins/romanah/gokbakja/models/productionmachine/fields.yaml +++ b/plugins/romanah/gokbakja/models/productionmachine/fields.yaml @@ -45,3 +45,8 @@ fields: label: 'Mechanic name' span: auto type: text + date: + label: Sene + span: auto + mode: datetime + type: datepicker diff --git a/plugins/romanah/gokbakja/plugin.yaml b/plugins/romanah/gokbakja/plugin.yaml index fad2554..89b9163 100644 --- a/plugins/romanah/gokbakja/plugin.yaml +++ b/plugins/romanah/gokbakja/plugin.yaml @@ -56,22 +56,18 @@ navigation: url: romanah/gokbakja/production icon: icon-bookmark sideMenu: - side-menu-item: - label: report - url: romanah/gokbakja/pivotproduction - icon: icon-sitemap side-menu-item2: - label: 'Halta Görnüşleri' + label: 'Rulon Görnüşleri' url: romanah/gokbakja/bagtype icon: icon-bars side-menu-item3: - label: 'Halta ölçegleri' + label: 'Rulon ölçegleri' url: romanah/gokbakja/bagsize icon: icon-simplybuilt - side-menu-item4: - label: 'Production Machine' - url: romanah/gokbakja/prodctionmachine - icon: icon-sliders + side-menu-item: + label: 'Reňk Gornushleri' + url: romanah/gokbakja/bagcolor + icon: icon-sitemap side-menu-item5: label: Tikinçiler url: romanah/gokbakja/sewerproduction @@ -86,6 +82,6 @@ navigation: url: romanah/gokbakja/machine icon: icon-codepen side-menu-item2: - label: Eksruiterler + label: Ekstrudorlar url: romanah/gokbakja/excruiter icon: icon-steam diff --git a/plugins/romanah/gokbakja/updates/builder_table_create_romanah_gokbakja_bag_color.php b/plugins/romanah/gokbakja/updates/builder_table_create_romanah_gokbakja_bag_color.php new file mode 100644 index 0000000..02dc004 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_create_romanah_gokbakja_bag_color.php @@ -0,0 +1,26 @@ +engine = 'InnoDB'; + $table->increments('id')->unsigned(); + $table->timestamp('created_at')->nullable(); + $table->timestamp('updated_at')->nullable(); + $table->timestamp('deleted_at')->nullable(); + $table->string('name'); + $table->text('note')->nullable(); + }); + } + + public function down() + { + Schema::dropIfExists('romanah_gokbakja_bag_color'); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_create_romanah_gokbakja_production_calculate.php b/plugins/romanah/gokbakja/updates/builder_table_create_romanah_gokbakja_production_calculate.php new file mode 100644 index 0000000..b5e68e0 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_create_romanah_gokbakja_production_calculate.php @@ -0,0 +1,31 @@ +engine = 'InnoDB'; + $table->increments('id')->unsigned(); + $table->timestamp('created_at')->nullable(); + $table->timestamp('updated_at')->nullable(); + $table->timestamp('deleted_at')->nullable(); + $table->integer('production_id'); + $table->integer('product_id'); + $table->double('hour_calc', 10, 0); + $table->double('amount_calc', 10, 0); + $table->integer('excruiter_id'); + $table->date('date'); + $table->time('time'); + }); + } + + public function down() + { + Schema::dropIfExists('romanah_gokbakja_production_calculate'); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_machine_3.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_machine_3.php new file mode 100644 index 0000000..dbb7e8e --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_machine_3.php @@ -0,0 +1,23 @@ +date('date')->nullable(); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_machine', function($table) + { + $table->dropColumn('date'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_machine_4.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_machine_4.php new file mode 100644 index 0000000..8b29c97 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_machine_4.php @@ -0,0 +1,23 @@ +dropColumn('date'); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_machine', function($table) + { + $table->date('date')->nullable(); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_payment.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_payment.php new file mode 100644 index 0000000..66d5e23 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_payment.php @@ -0,0 +1,23 @@ +date('date')->nullable(); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_payment', function($table) + { + $table->dropColumn('date'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_calculate.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_calculate.php new file mode 100644 index 0000000..558d8fb --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_calculate.php @@ -0,0 +1,23 @@ +integer('shift_id'); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_production_calculate', function($table) + { + $table->dropColumn('shift_id'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_calculate_2.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_calculate_2.php new file mode 100644 index 0000000..d82e54a --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_calculate_2.php @@ -0,0 +1,23 @@ +dropColumn('hour_calc'); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_production_calculate', function($table) + { + $table->double('hour_calc', 10, 0); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_calculate_3.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_calculate_3.php new file mode 100644 index 0000000..174607c --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_calculate_3.php @@ -0,0 +1,23 @@ +double('amount_percentage', 10, 0); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_production_calculate', function($table) + { + $table->dropColumn('amount_percentage'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_calculate_4.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_calculate_4.php new file mode 100644 index 0000000..38f3c74 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_calculate_4.php @@ -0,0 +1,23 @@ +double('hour_calc', 10, 0); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_production_calculate', function($table) + { + $table->dropColumn('hour_calc'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_calculate_5.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_calculate_5.php new file mode 100644 index 0000000..9d5cda6 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_calculate_5.php @@ -0,0 +1,23 @@ +dropColumn('hour_calc'); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_production_calculate', function($table) + { + $table->double('hour_calc', 10, 0); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_machine_5.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_machine_5.php new file mode 100644 index 0000000..acf06c7 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_machine_5.php @@ -0,0 +1,23 @@ +date('date')->nullable(); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_production_machine', function($table) + { + $table->dropColumn('date'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_machine_6.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_machine_6.php new file mode 100644 index 0000000..7984b77 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_production_machine_6.php @@ -0,0 +1,23 @@ +integer('color_id'); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_production_machine', function($table) + { + $table->dropColumn('color_id'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/version.yaml b/plugins/romanah/gokbakja/updates/version.yaml index 76669ff..40494f3 100644 --- a/plugins/romanah/gokbakja/updates/version.yaml +++ b/plugins/romanah/gokbakja/updates/version.yaml @@ -201,3 +201,39 @@ 1.0.68: - 'Updated table romanah_gokbakja_order' - builder_table_update_romanah_gokbakja_order_6.php +1.0.69: + - 'Updated table romanah_gokbakja_machine' + - builder_table_update_romanah_gokbakja_machine_3.php +1.0.70: + - 'Updated table romanah_gokbakja_machine' + - builder_table_update_romanah_gokbakja_machine_4.php +1.0.71: + - 'Updated table romanah_gokbakja_production_machine' + - builder_table_update_romanah_gokbakja_production_machine_5.php +1.0.72: + - 'Created table romanah_gokbakja_bag_color' + - builder_table_create_romanah_gokbakja_bag_color.php +1.0.73: + - 'Updated table romanah_gokbakja_production_machine' + - builder_table_update_romanah_gokbakja_production_machine_6.php +1.0.74: + - 'Updated table romanah_gokbakja_payment' + - builder_table_update_romanah_gokbakja_payment.php +1.0.75: + - 'Created table romanah_gokbakja_production_calculate' + - builder_table_create_romanah_gokbakja_production_calculate.php +1.0.76: + - 'Updated table romanah_gokbakja_production_calculate' + - builder_table_update_romanah_gokbakja_production_calculate.php +1.0.77: + - 'Updated table romanah_gokbakja_production_calculate' + - builder_table_update_romanah_gokbakja_production_calculate_2.php +1.0.78: + - 'Updated table romanah_gokbakja_production_calculate' + - builder_table_update_romanah_gokbakja_production_calculate_3.php +1.0.79: + - 'Updated table romanah_gokbakja_production_calculate' + - builder_table_update_romanah_gokbakja_production_calculate_4.php +1.0.80: + - 'Updated table romanah_gokbakja_production_calculate' + - builder_table_update_romanah_gokbakja_production_calculate_5.php diff --git a/themes/gokbakja/pages/machine/machine.htm b/themes/gokbakja/pages/machine/machine.htm index 318de20..433161b 100644 --- a/themes/gokbakja/pages/machine/machine.htm +++ b/themes/gokbakja/pages/machine/machine.htm @@ -44,8 +44,17 @@ detailsUrlParameter = "id" pageNumber = "{{ :page }}" [machineProduction] -== +[builderList builderList5] +modelClass = "Romanah\Gokbakja\Models\BagColor" +scope = "-" +scopeValue = "{{ :scope }}" +displayColumn = "id" +noRecordsMessage = "No records found" +detailsPage = "-" +detailsUrlParameter = "id" +pageNumber = "{{ :page }}" +== {% set records = builderList.records %} {% set displayColumn = builderList.displayColumn %} {% set noRecordsMessage = builderList.noRecordsMessage %} @@ -56,6 +65,7 @@ pageNumber = "{{ :page }}" {% set machines = builderList2.records %} {% set types = builderList4.records %} {% set sizes = builderList3.records %} +{% set colors = builderList5.records %} {% put styles %}
+
+
+ +
+ + + +
+
+
+ +
@@ -124,7 +153,7 @@ pageNumber = "{{ :page }}"

Enjamlar boýunça - ({{currentDate|date('d.m.Y | H:i')}})

+ (Şu günki sene: {{currentDate|date('d.m.Y | H:i')}})

Hasabat

@@ -144,10 +173,12 @@ pageNumber = "{{ :page }}" № + Öndürlen Sene Bina No Enjam No - Ölçegi - Görnüşi + Rulon Ölçegi + Rulon Görnüşi + Rulon Reňki Önen Önüm (kg) Ady Familiýasy Mehanik @@ -161,10 +192,12 @@ pageNumber = "{{ :page }}" № + Öndürlen Sene Bina No Enjam No - Ölçegi - Görnüşi + Rulon Ölçegi + Rulon Görnüşi + Rulon Reňki Önen Önüm (kg) Ady Familiýasy Mehanik @@ -183,6 +216,7 @@ pageNumber = "{{ :page }}"
{% put scripts %} + {% endput %} diff --git a/themes/gokbakja/pages/orders/order-detailpayment.htm b/themes/gokbakja/pages/orders/order-detailpayment.htm index e34c194..60fae3e 100644 --- a/themes/gokbakja/pages/orders/order-detailpayment.htm +++ b/themes/gokbakja/pages/orders/order-detailpayment.htm @@ -75,6 +75,16 @@ function onStart(){
+
+ +
+ + + +
+
@@ -144,7 +154,7 @@ function onStart(){ {{(key+1)}} {{payment.amount}} $ - {{payment.created_at|date('d.m.Y')}} + {{payment.date != null ? payment.date|date('d.m.Y') : ""}} {{payment.note}} diff --git a/themes/gokbakja/pages/production/production.htm b/themes/gokbakja/pages/production/production.htm index e0e351d..54b50f1 100644 --- a/themes/gokbakja/pages/production/production.htm +++ b/themes/gokbakja/pages/production/production.htm @@ -28,13 +28,13 @@ function onStart(){ $excruiter = $this->param("excruiter"); - $this["productions"] = Romanah\Gokbakja\Models\Production::whereDate('created_at', date($currentDateFormat))->where('excruiter_id', $excruiter)->with(['pivot_production', 'excruiter', 'shift'])->orderBy('id', 'DESC')->get(); + $this["productions"] = Romanah\Gokbakja\Models\Production::where('excruiter_id', $excruiter)->with(['pivot_production', 'excruiter', 'shift'])->orderBy('id', 'DESC')->get(); $this["productCounts"] = Romanah\Gokbakja\Models\Product::where('report', 'simple')->count(); $this["shifts"] = Romanah\Gokbakja\Models\Shift::get(); - $this["calcAll"] = Romanah\Gokbakja\Models\Production::whereDate('created_at', date($currentDateFormat))->sum('time'); + $this["calcAll"] = Romanah\Gokbakja\Models\Production::sum('time'); } ?> @@ -88,8 +88,7 @@ function onStart(){
-

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

+

Çig Mallar Boýunça

 @@ -119,6 +118,13 @@ function onStart(){
Saýla + + + + + + +