diff --git a/plugins/romanah/gokbakja/components/Sewer.php b/plugins/romanah/gokbakja/components/Sewer.php index 61a6857..a901272 100644 --- a/plugins/romanah/gokbakja/components/Sewer.php +++ b/plugins/romanah/gokbakja/components/Sewer.php @@ -143,7 +143,8 @@ class Sewer extends ComponentBase $data = post(); if ($data["produced_bag_qty"] == 0) { - return Flash::error("Tikilen halta sanyny girizin"); + Flash::error("Tikilen halta sanyny girizin"); + return Redirect::refresh(); }elseif(!$data["produced_bag_qty"] && $data["status"] == "working"){ $sewer = SewerModel::where("id", $data["sewer_id"])->first(); @@ -156,7 +157,7 @@ class Sewer extends ComponentBase Flash::success("Maglumatlar Ustunlikli Üýtgedildi"); return Redirect::refresh(); } else { - return Flash::error("Yalnyshlyk bar!!"); + Flash::error("Yalnyshlyk bar!!"); return Redirect::refresh(); } } else { @@ -182,14 +183,15 @@ class Sewer extends ComponentBase $machinProduction->is_finished = true; $machinProduction->save(); }else{ - return Flash::error("Status tamamlamaly!"); + Flash::error("Status tamamlamaly!"); + return Redirect::refresh(); } if ($sewer && $pivotSewer) { Flash::success("Maglumatlar Ustunlikli Üýtgedildi"); return Redirect::refresh(); } else { - return Flash::error("Yalnyshlyk bar!!"); + Flash::error("Yalnyshlyk bar!!"); return Redirect::refresh(); } } diff --git a/plugins/romanah/gokbakja/controllers/Journal.php b/plugins/romanah/gokbakja/controllers/Journal.php new file mode 100644 index 0000000..d6d44dd --- /dev/null +++ b/plugins/romanah/gokbakja/controllers/Journal.php @@ -0,0 +1,18 @@ + + + + diff --git a/plugins/romanah/gokbakja/controllers/journal/config_form.yaml b/plugins/romanah/gokbakja/controllers/journal/config_form.yaml new file mode 100644 index 0000000..5e4df00 --- /dev/null +++ b/plugins/romanah/gokbakja/controllers/journal/config_form.yaml @@ -0,0 +1,10 @@ +name: Journal +form: $/romanah/gokbakja/models/journal/fields.yaml +modelClass: Romanah\Gokbakja\Models\Journal +defaultRedirect: romanah/gokbakja/journal +create: + redirect: 'romanah/gokbakja/journal/update/:id' + redirectClose: romanah/gokbakja/journal +update: + redirect: romanah/gokbakja/journal + redirectClose: romanah/gokbakja/journal diff --git a/plugins/romanah/gokbakja/controllers/journal/config_list.yaml b/plugins/romanah/gokbakja/controllers/journal/config_list.yaml new file mode 100644 index 0000000..ad53386 --- /dev/null +++ b/plugins/romanah/gokbakja/controllers/journal/config_list.yaml @@ -0,0 +1,12 @@ +list: $/romanah/gokbakja/models/journal/columns.yaml +modelClass: Romanah\Gokbakja\Models\Journal +title: Journal +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/journal/update/:id' diff --git a/plugins/romanah/gokbakja/controllers/journal/create.htm b/plugins/romanah/gokbakja/controllers/journal/create.htm new file mode 100644 index 0000000..8e8aa67 --- /dev/null +++ b/plugins/romanah/gokbakja/controllers/journal/create.htm @@ -0,0 +1,46 @@ + + + + +fatalError): ?> + + 'layout']) ?> + +
+ formRender() ?> +
+ +
+
+ + + + + +
+
+ + + + +

fatalError)) ?>

+

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

fatalError) ?>

+ + +

+ + + +

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

fatalError)) ?>

+

+ \ No newline at end of file diff --git a/plugins/romanah/gokbakja/models/Journal.php b/plugins/romanah/gokbakja/models/Journal.php new file mode 100644 index 0000000..1bc494a --- /dev/null +++ b/plugins/romanah/gokbakja/models/Journal.php @@ -0,0 +1,34 @@ + [ + 'RainLab\User\Models\User', + 'key' => 'user_id' + ] + ]; + + /** + * @var string The database table used by the model. + */ + public $table = 'romanah_gokbakja_journal'; + + /** + * @var array Validation rules + */ + public $rules = [ + ]; +} diff --git a/plugins/romanah/gokbakja/models/journal/columns.yaml b/plugins/romanah/gokbakja/models/journal/columns.yaml new file mode 100644 index 0000000..0801f5a --- /dev/null +++ b/plugins/romanah/gokbakja/models/journal/columns.yaml @@ -0,0 +1,22 @@ +columns: + id: + label: id + type: number + created_at: + label: created_at + type: datetime + updated_at: + label: updated_at + type: datetime + type: + label: type + type: text + content_id: + label: content_id + type: number + user_id: + label: user_id + type: number + note: + label: note + type: text diff --git a/plugins/romanah/gokbakja/models/journal/fields.yaml b/plugins/romanah/gokbakja/models/journal/fields.yaml new file mode 100644 index 0000000..7d90358 --- /dev/null +++ b/plugins/romanah/gokbakja/models/journal/fields.yaml @@ -0,0 +1,29 @@ +fields: + content_id: + label: 'Content id' + span: auto + type: number + user: + label: User + nameFrom: name + descriptionFrom: description + span: auto + type: relation + type: + label: Type + options: + 'no': 'No' + ProductionMachine: Machine + SewerProduction: Sewer + Production: Production + Order: Order + OrderItem: 'Order Item' + Payment: 'Order Payment' + Shipping: 'Order Shipping' + span: full + default: 'no' + type: balloon-selector + note: + label: Note + span: auto + type: textarea diff --git a/plugins/romanah/gokbakja/plugin.yaml b/plugins/romanah/gokbakja/plugin.yaml index 4788648..9f95a0a 100644 --- a/plugins/romanah/gokbakja/plugin.yaml +++ b/plugins/romanah/gokbakja/plugin.yaml @@ -89,3 +89,7 @@ navigation: label: 'Cig mal' url: romanah/gokbakja/production icon: icon-life-ring + main-menu-item8: + label: Žurnal + url: romanah/gokbakja/journal + icon: icon-bell diff --git a/plugins/romanah/gokbakja/updates/builder_table_create_romanah_gokbakja_journal.php b/plugins/romanah/gokbakja/updates/builder_table_create_romanah_gokbakja_journal.php new file mode 100644 index 0000000..2d5d7f6 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_create_romanah_gokbakja_journal.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->string('type')->default('no'); + $table->integer('content_id'); + $table->integer('user_id'); + $table->text('note')->nullable(); + }); + } + + public function down() + { + Schema::dropIfExists('romanah_gokbakja_journal'); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_order_7.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_order_7.php new file mode 100644 index 0000000..472c1f2 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_order_7.php @@ -0,0 +1,23 @@ +integer('user_id')->nullable(); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_order', function($table) + { + $table->dropColumn('user_id'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_order_item_7.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_order_item_7.php new file mode 100644 index 0000000..816fbcb --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_order_item_7.php @@ -0,0 +1,23 @@ +integer('user_id')->nullable(); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_order_item', function($table) + { + $table->dropColumn('user_id'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_payment_2.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_payment_2.php new file mode 100644 index 0000000..3bbe316 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_payment_2.php @@ -0,0 +1,23 @@ +integer('user_id')->nullable(); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_payment', function($table) + { + $table->dropColumn('user_id'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_sewer_production_6.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_sewer_production_6.php new file mode 100644 index 0000000..408c145 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_sewer_production_6.php @@ -0,0 +1,23 @@ +integer('user_id')->nullable(); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_sewer_production', function($table) + { + $table->dropColumn('user_id'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_shipping_2.php b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_shipping_2.php new file mode 100644 index 0000000..18a6c73 --- /dev/null +++ b/plugins/romanah/gokbakja/updates/builder_table_update_romanah_gokbakja_shipping_2.php @@ -0,0 +1,23 @@ +integer('user_id')->nullable(); + }); + } + + public function down() + { + Schema::table('romanah_gokbakja_shipping', function($table) + { + $table->dropColumn('user_id'); + }); + } +} diff --git a/plugins/romanah/gokbakja/updates/version.yaml b/plugins/romanah/gokbakja/updates/version.yaml index 35048d7..2c03dfb 100644 --- a/plugins/romanah/gokbakja/updates/version.yaml +++ b/plugins/romanah/gokbakja/updates/version.yaml @@ -285,3 +285,21 @@ 1.0.96: - 'Updated table romanah_gokbakja_order_item' - builder_table_update_romanah_gokbakja_order_item_6.php +1.0.97: + - 'Updated table romanah_gokbakja_order' + - builder_table_update_romanah_gokbakja_order_7.php +1.0.98: + - 'Updated table romanah_gokbakja_order_item' + - builder_table_update_romanah_gokbakja_order_item_7.php +1.0.99: + - 'Updated table romanah_gokbakja_payment' + - builder_table_update_romanah_gokbakja_payment_2.php +1.0.100: + - 'Updated table romanah_gokbakja_sewer_production' + - builder_table_update_romanah_gokbakja_sewer_production_6.php +1.0.101: + - 'Updated table romanah_gokbakja_shipping' + - builder_table_update_romanah_gokbakja_shipping_2.php +1.0.102: + - 'Created table romanah_gokbakja_journal' + - builder_table_create_romanah_gokbakja_journal.php diff --git a/themes/gokbakja/pages/notifications.htm b/themes/gokbakja/pages/notifications.htm new file mode 100644 index 0000000..5879e02 --- /dev/null +++ b/themes/gokbakja/pages/notifications.htm @@ -0,0 +1,5 @@ +title = "notifications" +url = "/notifications" +layout = "platform_main" +is_hidden = 0 +== \ No newline at end of file