diff --git a/plugins/romanah/gokbakja/Plugin.php b/plugins/romanah/gokbakja/Plugin.php index d7db121..80508b9 100644 --- a/plugins/romanah/gokbakja/Plugin.php +++ b/plugins/romanah/gokbakja/Plugin.php @@ -9,6 +9,8 @@ class Plugin extends PluginBase return [ 'Romanah\Gokbakja\Components\Action' => 'action', 'Romanah\Gokbakja\Components\Production' => 'production', + 'Romanah\Gokbakja\Components\Sewer' => 'sewer', + 'Romanah\Gokbakja\Components\Order' => 'order', ]; } diff --git a/plugins/romanah/gokbakja/components/Order.php b/plugins/romanah/gokbakja/components/Order.php new file mode 100644 index 0000000..63baeb9 --- /dev/null +++ b/plugins/romanah/gokbakja/components/Order.php @@ -0,0 +1,118 @@ + 'Order', + 'description' => 'Order settings' + ]; + } + + + public function onRender(){ + + $html_data = ''; + + $orderDatas = OrderModel::with(["client", "shipping"])->orderBy('id', 'DESC')->get(); + + for ($x = 0; $x < count($orderDatas); $x++) { + $html_data .= ' + '.($x+1).' + '.$orderDatas[$x]->client->name.' + '.$orderDatas[$x]->client->country.' + '.$orderDatas[$x]->amount.' kg + '.$orderDatas[$x]->price.' + + '.$orderDatas[$x]->shipping->status.' + + '.$orderDatas[$x]->note.' + '; + } + + return $html_data; + } + + + public function onCreateOrder() + { + $currentDate = Carbon::now()->timezone('UTC +05:00'); + + $currentDateFormat = $currentDate->format('Y-m-d'); + + $data = post(); + + $createOrder = new OrderModel(); + $createOrder->client_id = $data["client_id"]; + $createOrder->amount = $data["amount"]; + $createOrder->price = $data["price"]; + $createOrder->note = $data["note"]; + $createOrder->shipping_id = 0; + $createOrder->save(); + + $createShipping = new ShippingModel(); + $createShipping->order_id = $createOrder->id; + $createShipping->status = 'note_loaded'; + $createShipping->employee_id = 0; + $createShipping->place_now = "Aşgabat"; + $createShipping->loaded_amount = 0; + $createShipping->note = ""; + $createShipping->save(); + + + $createOrder->shipping_id = $createShipping->id; + $createOrder->save(); + + $html_data = ''; + + $orderDatas = OrderModel::with(["client", "shipping"])->orderBy('id', 'DESC')->get(); + + for ($x = 0; $x < count($orderDatas); $x++) { + // dd($orderDatas[$x]->shipping->status); + $html_data .= ' + '.($x+1).' + '.$orderDatas[$x]->client->name.' + '.$orderDatas[$x]->client->country.' + '.$orderDatas[$x]->amount.' kg + '.$orderDatas[$x]->price.' + + '.$orderDatas[$x]->shipping->status.' + + '.$orderDatas[$x]->note.' + '; + } + + if($createOrder){ + + Flash::success("Sargyt Ustunlikli Goşuldy"); + return [ + '#order_datas' => $html_data, + ]; + }else{ + return Flash::error("Yalnyshlyk bar!!"); + } + + + } + + +} diff --git a/plugins/romanah/gokbakja/components/Sewer.php b/plugins/romanah/gokbakja/components/Sewer.php new file mode 100644 index 0000000..55e6f23 --- /dev/null +++ b/plugins/romanah/gokbakja/components/Sewer.php @@ -0,0 +1,105 @@ + 'Sewer', + 'description' => 'Sewer settings' + ]; + } + + + + // public function onRun() { + // $this->sewers = $this->loadSewers(); + // } + + + + public function onRender(){ + + $html_data = ''; + + $sewerDatas = SewerModel::with("employee")->orderBy('id', 'DESC')->get(); + + for ($x = 0; $x < count($sewerDatas); $x++) { + $html_data .= ' + '.($x+1).' + '.$sewerDatas[$x]->employee->name.' + '.$sewerDatas[$x]->created_at->format('m.d.Y').' + '.$sewerDatas[$x]->amount.' kg + + '.$sewerDatas[$x]->produced_bag_qty.' + '.$sewerDatas[$x]->note.' + '; + } + + return $html_data; + } + + + public function onCreateSewerProduction() + { + $currentDate = Carbon::now()->timezone('UTC +05:00'); + + $currentDateFormat = $currentDate->format('Y-m-d'); + + $data = post(); + + $createSewer = new SewerModel(); + $createSewer->employee_id = $data["employee_id"]; + $createSewer->amount = $data["amount"]; + $createSewer->produced_bag_qty = $data["produced_bag_qty"]; + $createSewer->note = $data["note"]; + $createSewer->save(); + + + $html_data = ''; + + $sewerDatas = SewerModel::with("employee")->orderBy('id', 'DESC')->get(); + + for ($x = 0; $x < count($sewerDatas); $x++) { + $html_data .= ' + '.($x+1).' + '.$sewerDatas[$x]->employee->name.' + '.$sewerDatas[$x]->created_at->format('m.d.Y').' + '.$sewerDatas[$x]->amount.' kg + + '.$sewerDatas[$x]->produced_bag_qty.' + '.$sewerDatas[$x]->note.' + '; + } + + if($createSewer){ + + Flash::success("Hasabat Ustunlikli Goşuldy"); + return [ + '#sewer_datas' => $html_data, + ]; + }else{ + return Flash::error("Yalnyshlyk bar!!"); + } + + + } + + +} diff --git a/plugins/romanah/gokbakja/controllers/Client.php b/plugins/romanah/gokbakja/controllers/Client.php new file mode 100644 index 0000000..61a8096 --- /dev/null +++ b/plugins/romanah/gokbakja/controllers/Client.php @@ -0,0 +1,18 @@ + + + + diff --git a/plugins/romanah/gokbakja/controllers/client/config_form.yaml b/plugins/romanah/gokbakja/controllers/client/config_form.yaml new file mode 100644 index 0000000..da34a68 --- /dev/null +++ b/plugins/romanah/gokbakja/controllers/client/config_form.yaml @@ -0,0 +1,10 @@ +name: Client +form: $/romanah/gokbakja/models/client/fields.yaml +modelClass: Romanah\Gokbakja\Models\Client +defaultRedirect: romanah/gokbakja/client +create: + redirect: 'romanah/gokbakja/client/update/:id' + redirectClose: romanah/gokbakja/client +update: + redirect: romanah/gokbakja/client + redirectClose: romanah/gokbakja/client diff --git a/plugins/romanah/gokbakja/controllers/client/config_list.yaml b/plugins/romanah/gokbakja/controllers/client/config_list.yaml new file mode 100644 index 0000000..6f7a5e3 --- /dev/null +++ b/plugins/romanah/gokbakja/controllers/client/config_list.yaml @@ -0,0 +1,12 @@ +list: $/romanah/gokbakja/models/client/columns.yaml +modelClass: Romanah\Gokbakja\Models\Client +title: Client +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/client/update/:id' diff --git a/plugins/romanah/gokbakja/controllers/client/create.htm b/plugins/romanah/gokbakja/controllers/client/create.htm new file mode 100644 index 0000000..dec21bf --- /dev/null +++ b/plugins/romanah/gokbakja/controllers/client/create.htm @@ -0,0 +1,46 @@ + + + + +fatalError): ?> + + 'layout']) ?> + +
+ formRender() ?> +
+ +
+
+ + + + + +
+
+ + + + +

fatalError)) ?>

+

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

fatalError) ?>

+ + +

+ + + +

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

fatalError)) ?>

+

+ \ No newline at end of file diff --git a/plugins/romanah/gokbakja/models/Client.php b/plugins/romanah/gokbakja/models/Client.php new file mode 100644 index 0000000..8c38efc --- /dev/null +++ b/plugins/romanah/gokbakja/models/Client.php @@ -0,0 +1,33 @@ + [ + 'Romanah\Gokbakja\Models\Order', + 'key' => 'client_id' + ] + ]; + + /** + * @var string The database table used by the model. + */ + public $table = 'romanah_gokbakja_client'; + + /** + * @var array Validation rules + */ + public $rules = [ + ]; +} diff --git a/plugins/romanah/gokbakja/models/Order.php b/plugins/romanah/gokbakja/models/Order.php index 97e53c4..e6700f0 100644 --- a/plugins/romanah/gokbakja/models/Order.php +++ b/plugins/romanah/gokbakja/models/Order.php @@ -13,11 +13,18 @@ class Order extends Model protected $dates = ['deleted_at']; - public $hasMany = [ - 'shipping' => [ - 'Romanah\Gokbakja\Models\Order', - 'key' => 'order_id' + public $belongsTo = [ + 'client' => [ + 'Romanah\Gokbakja\Models\Client', + 'key' => 'client_id' ], + 'shipping' => [ + 'Romanah\Gokbakja\Models\Shipping', + 'key' => 'shipping_id' + ], + ]; + + public $hasMany = [ 'order_items' => [ 'Romanah\Gokbakja\Models\OrderItem', 'key' => 'order_id' diff --git a/plugins/romanah/gokbakja/models/client/columns.yaml b/plugins/romanah/gokbakja/models/client/columns.yaml new file mode 100644 index 0000000..7624dc8 --- /dev/null +++ b/plugins/romanah/gokbakja/models/client/columns.yaml @@ -0,0 +1,22 @@ +columns: + id: + label: id + type: number + name: + label: name + type: text + country: + label: country + type: text + city: + label: city + type: text + phone: + label: phone + type: text + email: + label: email + type: text + note: + label: note + type: text diff --git a/plugins/romanah/gokbakja/models/client/fields.yaml b/plugins/romanah/gokbakja/models/client/fields.yaml new file mode 100644 index 0000000..9a0e149 --- /dev/null +++ b/plugins/romanah/gokbakja/models/client/fields.yaml @@ -0,0 +1,26 @@ +fields: + name: + label: Ady + span: auto + type: text + country: + label: Ýurdy + span: auto + type: text + city: + label: Şäher + span: auto + type: text + phone: + label: Telefon + span: auto + type: text + email: + label: Email + span: auto + type: text + note: + label: Bellik + span: auto + size: '' + type: textarea diff --git a/plugins/romanah/gokbakja/models/employee/fields.yaml b/plugins/romanah/gokbakja/models/employee/fields.yaml index 0a20bf0..1491c15 100644 --- a/plugins/romanah/gokbakja/models/employee/fields.yaml +++ b/plugins/romanah/gokbakja/models/employee/fields.yaml @@ -28,3 +28,7 @@ fields: nameFrom: name descriptionFrom: description type: relation + is_sewer: + label: Tikinçimi + span: auto + type: switch diff --git a/plugins/romanah/gokbakja/models/order/fields.yaml b/plugins/romanah/gokbakja/models/order/fields.yaml index b9ad101..fb7f8b1 100644 --- a/plugins/romanah/gokbakja/models/order/fields.yaml +++ b/plugins/romanah/gokbakja/models/order/fields.yaml @@ -7,12 +7,14 @@ fields: label: Bahasy span: auto type: number - client: - label: Alyjy - span: auto - type: text note: label: Bellik span: auto size: '' type: textarea + client: + label: Klent + span: auto + nameFrom: name + descriptionFrom: description + type: relation diff --git a/plugins/romanah/gokbakja/plugin.yaml b/plugins/romanah/gokbakja/plugin.yaml index 15d0664..fad2554 100644 --- a/plugins/romanah/gokbakja/plugin.yaml +++ b/plugins/romanah/gokbakja/plugin.yaml @@ -26,6 +26,10 @@ navigation: label: Tölegler url: romanah/gokbakja/payment icon: icon-money + side-menu-item5: + label: Klentlar + url: romanah/gokbakja/client + icon: icon-user main-menu-item2: label: 'Giriş we Çykyş' url: romanah/gokbakja/action diff --git a/plugins/romanah/gokbakja/updates/builder_table_create_romanah_gokbakja_client.php b/plugins/romanah/gokbakja/updates/builder_table_create_romanah_gokbakja_client.php new file mode 100644 index 0000000..df66f50 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_create_romanah_gokbakja_client.php @@ -0,0 +1,30 @@ +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->string('country')->nullable(); + $table->string('city')->nullable(); + $table->string('phone')->nullable(); + $table->string('email')->nullable(); + $table->text('note')->nullable(); + }); + } + + public function down() + { + Schema::dropIfExists('romanah_gokbakja_client'); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_employee_4.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_employee_4.php new file mode 100644 index 0000000..ec72ea0 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_employee_4.php @@ -0,0 +1,23 @@ +boolean('is_sewer')->default(0); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_employee', function($table) + { + $table->dropColumn('is_sewer'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_order_3.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_order_3.php new file mode 100644 index 0000000..9348485 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_order_3.php @@ -0,0 +1,25 @@ +integer('client_id'); + $table->dropColumn('client'); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_order', function($table) + { + $table->dropColumn('client_id'); + $table->string('client', 191)->nullable(); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_order_4.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_order_4.php new file mode 100644 index 0000000..e6b0d7a --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_order_4.php @@ -0,0 +1,23 @@ +integer('shipping_id'); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_order', function($table) + { + $table->dropColumn('shipping_id'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/version.yaml b/plugins/romanah/gokbakja/updates/version.yaml index 403d377..12a02c5 100644 --- a/plugins/romanah/gokbakja/updates/version.yaml +++ b/plugins/romanah/gokbakja/updates/version.yaml @@ -162,3 +162,15 @@ 1.0.55: - 'Updated table romanah_gokbakja_pivot_production' - builder_table_update_romanah_gokbakja_pivot_production_8.php +1.0.56: + - 'Created table romanah_gokbakja_client' + - builder_table_create_romanah_gokbakja_client.php +1.0.57: + - 'Updated table romanah_gokbakja_order' + - builder_table_update_romanah_gokbakja_order_3.php +1.0.58: + - 'Updated table romanah_gokbakja_employee' + - builder_table_update_romanah_gokbakja_employee_4.php +1.0.59: + - 'Updated table romanah_gokbakja_order' + - builder_table_update_romanah_gokbakja_order_4.php diff --git a/themes/gokbakja/meta/menus/aside.yaml b/themes/gokbakja/meta/menus/aside.yaml index 3c1e548..26314d1 100644 --- a/themes/gokbakja/meta/menus/aside.yaml +++ b/themes/gokbakja/meta/menus/aside.yaml @@ -18,7 +18,7 @@ items: type: cms-page url: null code: '' - reference: stocks + reference: stock/stocks cmsPage: null replace: null viewBag: @@ -81,9 +81,26 @@ items: items: - title: 'Täze Hasabat' + nesting: null type: cms-page + url: null code: '' - reference: excruiters + reference: production/excruiters + cmsPage: null + replace: null + viewBag: + isHidden: '0' + cssClass: '' + isExternal: '0' + - + title: Hasabat + nesting: null + type: cms-page + url: null + code: '' + reference: production/report-dynamic + cmsPage: null + replace: null viewBag: isHidden: '0' cssClass: '' @@ -94,7 +111,7 @@ items: type: cms-page url: null code: '' - reference: all-productions + reference: production/all-production-month cmsPage: null replace: null viewBag: @@ -107,7 +124,7 @@ items: type: cms-page url: null code: '' - reference: report-production + reference: production/report-production cmsPage: null replace: null viewBag: @@ -129,38 +146,21 @@ items: isExternal: '0' items: - - title: 'Täze Hasabat' - nesting: null + title: 'Hasabat Sanawy' type: cms-page - url: null code: '' - reference: machine - cmsPage: null - replace: null + reference: machine/machine viewBag: isHidden: '0' cssClass: '' isExternal: '0' - - title: 'Aýlar boýunca' + title: Hasabat nesting: null type: cms-page url: null code: '' - reference: all-production-machine-month - cmsPage: null - replace: null - viewBag: - isHidden: '0' - cssClass: '' - isExternal: '0' - - - title: 'Ýyl Boýunça' - nesting: null - type: cms-page - url: null - code: '' - reference: report-production-machine + reference: machine/report cmsPage: null replace: null viewBag: @@ -173,7 +173,7 @@ items: type: cms-page url: null code: '' - reference: machine-production-mechanic + reference: machine/machine-production-mechanic cmsPage: null replace: null viewBag: @@ -195,12 +195,21 @@ items: isExternal: '0' items: - - title: 'Taze hasabat' - nesting: null - type: url - url: /s + title: 'Hasabat Sanawy' + type: cms-page code: '' - reference: null + reference: sewer/new + viewBag: + isHidden: '0' + cssClass: '' + isExternal: '0' + - + title: Hasabat + nesting: null + type: cms-page + url: null + code: '' + reference: sewer/month cmsPage: null replace: null viewBag: @@ -220,4 +229,40 @@ items: isHidden: '0' cssClass: ri-shopping-cart-2-line isExternal: '0' + items: + - + title: 'Sargytlar Sanawy' + type: cms-page + code: '' + reference: orders/new + viewBag: + isHidden: '0' + cssClass: '' + isExternal: '0' + - + title: Logitstika + nesting: null + type: cms-page + url: null + code: '' + reference: orders/shipping + cmsPage: null + replace: null + viewBag: + isHidden: '0' + cssClass: '' + isExternal: '0' + - + title: Hasabat + nesting: null + type: cms-page + url: null + code: '' + reference: orders/report + cmsPage: null + replace: null + viewBag: + isHidden: '0' + cssClass: '' + isExternal: '0' name: aside diff --git a/themes/gokbakja/pages/all-production-machine-month.htm b/themes/gokbakja/pages/machine/all-production-machine-month.htm similarity index 100% rename from themes/gokbakja/pages/all-production-machine-month.htm rename to themes/gokbakja/pages/machine/all-production-machine-month.htm diff --git a/themes/gokbakja/pages/get-all-machine-production-month.htm b/themes/gokbakja/pages/machine/get-all-machine-production-month.htm similarity index 99% rename from themes/gokbakja/pages/get-all-machine-production-month.htm rename to themes/gokbakja/pages/machine/get-all-machine-production-month.htm index 8e88fd2..2ba8010 100644 --- a/themes/gokbakja/pages/get-all-machine-production-month.htm +++ b/themes/gokbakja/pages/machine/get-all-machine-production-month.htm @@ -134,4 +134,4 @@ function onStart() { -{% partial 'dataTableJs' %} +{% partial 'dataTableJs' %} \ No newline at end of file diff --git a/themes/gokbakja/pages/get-mechanic.htm b/themes/gokbakja/pages/machine/get-mechanic.htm similarity index 100% rename from themes/gokbakja/pages/get-mechanic.htm rename to themes/gokbakja/pages/machine/get-mechanic.htm diff --git a/themes/gokbakja/pages/get-production-machine.htm b/themes/gokbakja/pages/machine/get-production-machine.htm similarity index 99% rename from themes/gokbakja/pages/get-production-machine.htm rename to themes/gokbakja/pages/machine/get-production-machine.htm index 23a0f68..c7624f1 100644 --- a/themes/gokbakja/pages/get-production-machine.htm +++ b/themes/gokbakja/pages/machine/get-production-machine.htm @@ -137,4 +137,4 @@ function onStart() { -{% partial 'dataTableJs' %} +{% partial 'dataTableJs' %} \ No newline at end of file diff --git a/themes/gokbakja/pages/machine-production-mechanic.htm b/themes/gokbakja/pages/machine/machine-production-mechanic.htm similarity index 99% rename from themes/gokbakja/pages/machine-production-mechanic.htm rename to themes/gokbakja/pages/machine/machine-production-mechanic.htm index b579981..a171d3b 100644 --- a/themes/gokbakja/pages/machine-production-mechanic.htm +++ b/themes/gokbakja/pages/machine/machine-production-mechanic.htm @@ -147,4 +147,4 @@ function onStart() { -{% partial 'dataTableJs' %} +{% partial 'dataTableJs' %} \ No newline at end of file diff --git a/themes/gokbakja/pages/machine.htm b/themes/gokbakja/pages/machine/machine.htm similarity index 64% rename from themes/gokbakja/pages/machine.htm rename to themes/gokbakja/pages/machine/machine.htm index d0edc04..fe1ced1 100644 --- a/themes/gokbakja/pages/machine.htm +++ b/themes/gokbakja/pages/machine/machine.htm @@ -84,6 +84,53 @@ function onStart(){
+ +
+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+
@@ -93,59 +140,15 @@ function onStart(){ ({{currentDate|date('d.m.Y | H:i')}})

Hasabat

+
-
- - - - - - - - - - - - - - - - - -
Täze maglumat - - - - - - - - - - - -
-
@@ -174,7 +177,8 @@ function onStart(){ + style="font-size: 14px;">{{machine.produced_weight|number_format}} kg + diff --git a/themes/gokbakja/pages/report-production-machine.htm b/themes/gokbakja/pages/machine/report-production-machine.htm similarity index 99% rename from themes/gokbakja/pages/report-production-machine.htm rename to themes/gokbakja/pages/machine/report-production-machine.htm index 6110ff4..acc0d6c 100644 --- a/themes/gokbakja/pages/report-production-machine.htm +++ b/themes/gokbakja/pages/machine/report-production-machine.htm @@ -95,4 +95,4 @@ function onStart(){ -{% partial 'dataTableJs' %} +{% partial 'dataTableJs' %} \ No newline at end of file diff --git a/themes/gokbakja/pages/machine/report.htm b/themes/gokbakja/pages/machine/report.htm new file mode 100644 index 0000000..bd24b79 --- /dev/null +++ b/themes/gokbakja/pages/machine/report.htm @@ -0,0 +1,5 @@ +title = "machine/report" +url = "/machinereport" +layout = "platform_main" +is_hidden = 0 +== \ No newline at end of file diff --git a/themes/gokbakja/pages/orders/new.htm b/themes/gokbakja/pages/orders/new.htm new file mode 100644 index 0000000..810f0a8 --- /dev/null +++ b/themes/gokbakja/pages/orders/new.htm @@ -0,0 +1,139 @@ +title = "orders/new" +url = "/orders/new" +layout = "platform_main" +is_hidden = 0 + +[order] +== +get(); + $this["clients"] = Romanah\Gokbakja\Models\Client::get(); +} +?> +== +{% put styles %} + + + + + +{% endput %} + +
+
+
+
+
+
+
+
+
+ + +
+ +
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+ + +
+ +
+ +
+
+
+ +
+
+ +
+ +
+
+
+
+
+
+

Sargytlar

+

Hasabat

+
+ +
+ + +
{{machine.bag_size.name}} {{machine.bag_type.name}} {{machine.produced_weight|number_format}} kg {{machine.employee_name}} {{machine.mechanic_name}} {{machine.note}}
+ + + + + + + + + + + + + {% component 'order' %} + + + + + + + + + + + + +
KlentÝurdyMukdaryBahasyLogistikaBellik
KlentÝurdyMukdaryBahasyLogistikaBellik
+
+ + + +
+
+ + + +{% put scripts %} + + +{% endput %} + +{% partial 'dataTableJs' %} diff --git a/themes/gokbakja/pages/orders/report.htm b/themes/gokbakja/pages/orders/report.htm new file mode 100644 index 0000000..f3c26d8 --- /dev/null +++ b/themes/gokbakja/pages/orders/report.htm @@ -0,0 +1,6 @@ +title = "orders/report" +url = "/orders/report" +layout = "platform_main" +is_hidden = 0 +== +list order \ No newline at end of file diff --git a/themes/gokbakja/pages/orders/shipping.htm b/themes/gokbakja/pages/orders/shipping.htm new file mode 100644 index 0000000..f31107c --- /dev/null +++ b/themes/gokbakja/pages/orders/shipping.htm @@ -0,0 +1,6 @@ +title = "orders/shipping" +url = "/orders/shipping" +layout = "platform_main" +is_hidden = 0 +== +shipping order \ No newline at end of file diff --git a/themes/gokbakja/pages/all-production-month.htm b/themes/gokbakja/pages/production/all-production-month.htm similarity index 99% rename from themes/gokbakja/pages/all-production-month.htm rename to themes/gokbakja/pages/production/all-production-month.htm index 5aabceb..2826c26 100644 --- a/themes/gokbakja/pages/all-production-month.htm +++ b/themes/gokbakja/pages/production/all-production-month.htm @@ -181,4 +181,4 @@ function onStart() { -{% partial 'dataTableJs' %} +{% partial 'dataTableJs' %} \ No newline at end of file diff --git a/themes/gokbakja/pages/all-productions.htm b/themes/gokbakja/pages/production/all-productions.htm similarity index 99% rename from themes/gokbakja/pages/all-productions.htm rename to themes/gokbakja/pages/production/all-productions.htm index 3acf103..3a7d558 100644 --- a/themes/gokbakja/pages/all-productions.htm +++ b/themes/gokbakja/pages/production/all-productions.htm @@ -154,4 +154,4 @@ function onStart() { -{% partial 'dataTableJs' %} +{% partial 'dataTableJs' %} \ No newline at end of file diff --git a/themes/gokbakja/pages/excruiters.htm b/themes/gokbakja/pages/production/excruiters.htm similarity index 99% rename from themes/gokbakja/pages/excruiters.htm rename to themes/gokbakja/pages/production/excruiters.htm index e751dc1..a424d9d 100644 --- a/themes/gokbakja/pages/excruiters.htm +++ b/themes/gokbakja/pages/production/excruiters.htm @@ -26,4 +26,4 @@ function onStart(){ {% endfor %} - + \ No newline at end of file diff --git a/themes/gokbakja/pages/get-production.htm b/themes/gokbakja/pages/production/get-production.htm similarity index 99% rename from themes/gokbakja/pages/get-production.htm rename to themes/gokbakja/pages/production/get-production.htm index 03516ed..1087d3f 100644 --- a/themes/gokbakja/pages/get-production.htm +++ b/themes/gokbakja/pages/production/get-production.htm @@ -140,4 +140,4 @@ function onStart() { -{% partial 'dataTableJs' %} +{% partial 'dataTableJs' %} \ No newline at end of file diff --git a/themes/gokbakja/pages/production.htm b/themes/gokbakja/pages/production/production.htm similarity index 100% rename from themes/gokbakja/pages/production.htm rename to themes/gokbakja/pages/production/production.htm diff --git a/themes/gokbakja/pages/production/report-dynamic.htm b/themes/gokbakja/pages/production/report-dynamic.htm new file mode 100644 index 0000000..e0988cb --- /dev/null +++ b/themes/gokbakja/pages/production/report-dynamic.htm @@ -0,0 +1,138 @@ +title = "production/report-dynamic" +url = "/production/report-dynamic" +layout = "platform_main" +is_hidden = 0 +== + +== + +{% put styles %} + + + +{% endput %} + + +
+
+
+
+
+
+
+
+ + +
+ + +
+
+
+
+ + +
+
+ + +
+
+ +
+ +
+
+
+
+ +
+
+
+
+
+
+
+

Çig Mallar Boýunça Umumy + ({{year}} ýyl)

+

Hasabat

+
+ +
+ + + + + + + + + {% for key, record in reportProducts %} + + {% endfor %} + + + + + + + + {% partial 'report/row' products=reportProducts title="Ýanwar" no=1 %} + + + + + + + + + {% for key, record in reportProducts %} + + {% endfor %} + + + +
AýlarOrtaça Işlenen{{record.name}}Bellik
SenesiHemmesi{{record.name}}Bellik
+
+ + + +
+
+
+
+ + +{% partial 'dataTableJs' %} +{% put scripts %} + + +{% endput %} diff --git a/themes/gokbakja/pages/report-production.htm b/themes/gokbakja/pages/production/report-production.htm similarity index 99% rename from themes/gokbakja/pages/report-production.htm rename to themes/gokbakja/pages/production/report-production.htm index 217907e..24bea94 100644 --- a/themes/gokbakja/pages/report-production.htm +++ b/themes/gokbakja/pages/production/report-production.htm @@ -3,6 +3,7 @@ url = "/report-production/:year?" layout = "platform_main" is_hidden = 0 == +timezone('UTC +05:00'); @@ -16,6 +17,7 @@ function onStart(){ $this["reportProducts"] = Romanah\Gokbakja\Models\Product::where("report", "simple")->get(); } +?> == {% put styles %} -{% partial 'dataTableJs' %} +{% partial 'dataTableJs' %} \ No newline at end of file diff --git a/themes/gokbakja/pages/sewer/month.htm b/themes/gokbakja/pages/sewer/month.htm new file mode 100644 index 0000000..c3ebce6 --- /dev/null +++ b/themes/gokbakja/pages/sewer/month.htm @@ -0,0 +1,6 @@ +title = "sewer/month" +url = "/sewer/month" +layout = "platform_main" +is_hidden = 0 +== +seweer month \ No newline at end of file diff --git a/themes/gokbakja/pages/sewer/new.htm b/themes/gokbakja/pages/sewer/new.htm new file mode 100644 index 0000000..d2fbcae --- /dev/null +++ b/themes/gokbakja/pages/sewer/new.htm @@ -0,0 +1,143 @@ +title = "sewer/new" +url = "/sewer/new" +layout = "platform_main" +is_hidden = 0 + +[sewer] +== +where("is_sewer", 1)->get(); +} +?> +== +{% put styles %} + + + + + +{% endput %} + +
+
+
+
+
+ +
+
+
+
+ + +
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+ + +
+ +
+ +
+
+
+ +
+
+
+ +
+ +
+
+
+
+
+
+

Tikinçiler boýunça

+

Hasabat

+
+ +
+ + + + + + + + + + + + + + + + + {% component 'sewer' %} + + + + + + + + + + + + +
TikinçiSenesiÇig mal mukdaryTikilen HaltaBellik
TikinçiSenesiÇig mal mukdaryTikilen HaltaBellik
+
+ + + +
+
+
+
+ +{% put scripts %} + + +{% endput %} +{% partial 'dataTableJs' %} diff --git a/themes/gokbakja/pages/stocks.htm b/themes/gokbakja/pages/stock/stocks.htm similarity index 99% rename from themes/gokbakja/pages/stocks.htm rename to themes/gokbakja/pages/stock/stocks.htm index 0717878..fc34339 100644 --- a/themes/gokbakja/pages/stocks.htm +++ b/themes/gokbakja/pages/stock/stocks.htm @@ -174,4 +174,4 @@ sortDirection = "desc" -{% partial 'dataTableJs' %} +{% partial 'dataTableJs' %} \ No newline at end of file diff --git a/themes/gokbakja/partials/production/modal.htm b/themes/gokbakja/partials/production/modal.htm index dfebbe1..043bc0d 100644 --- a/themes/gokbakja/partials/production/modal.htm +++ b/themes/gokbakja/partials/production/modal.htm @@ -7,7 +7,7 @@