From c846c8117218b25471386c9d8fa01b0d4f6aeabe Mon Sep 17 00:00:00 2001 From: root Date: Wed, 13 Mar 2024 12:32:27 +0000 Subject: [PATCH] latest changes from server --- .../components/smallcontactform/scf-form.htm | 9 ++-- .../tps/shops/controllers/Notification.php | 18 +++++++ .../notification/_list_toolbar.htm | 18 +++++++ .../controllers/notification/config_form.yaml | 10 ++++ .../controllers/notification/config_list.yaml | 12 +++++ .../shops/controllers/notification/create.htm | 46 ++++++++++++++++ .../shops/controllers/notification/index.htm | 1 + .../controllers/notification/preview.htm | 22 ++++++++ .../shops/controllers/notification/update.htm | 54 +++++++++++++++++++ plugins/tps/shops/models/Notification.php | 27 ++++++++++ .../shops/models/notification/columns.yaml | 10 ++++ .../tps/shops/models/notification/fields.yaml | 10 ++++ plugins/tps/shops/models/sale/fields.yaml | 3 +- plugins/tps/shops/models/shop/columns.yaml | 16 ++++++ plugins/tps/shops/plugin.yaml | 4 ++ ...er_table_create_tps_shops_notification.php | 26 +++++++++ plugins/tps/shops/updates/version.yaml | 3 ++ themes/berkarar/pages/map.htm | 32 +++++++++++ themes/berkarar/pages/profile.htm | 42 +++++++++++++++ themes/berkarar/pages/shop.htm | 15 ++++++ themes/berkarar/partials/home/map.htm | 49 +++++++++++++++++ themes/berkarar/partials/home/movies.htm | 4 +- themes/berkarar/partials/site/footer.htm | 8 +-- themes/berkarar/partials/site/navigation.htm | 8 +-- 24 files changed, 432 insertions(+), 15 deletions(-) create mode 100644 plugins/tps/shops/controllers/Notification.php create mode 100644 plugins/tps/shops/controllers/notification/_list_toolbar.htm create mode 100644 plugins/tps/shops/controllers/notification/config_form.yaml create mode 100644 plugins/tps/shops/controllers/notification/config_list.yaml create mode 100644 plugins/tps/shops/controllers/notification/create.htm create mode 100644 plugins/tps/shops/controllers/notification/index.htm create mode 100644 plugins/tps/shops/controllers/notification/preview.htm create mode 100644 plugins/tps/shops/controllers/notification/update.htm create mode 100644 plugins/tps/shops/models/Notification.php create mode 100644 plugins/tps/shops/models/notification/columns.yaml create mode 100644 plugins/tps/shops/models/notification/fields.yaml create mode 100644 plugins/tps/shops/updates/builder_table_create_tps_shops_notification.php create mode 100644 themes/berkarar/pages/map.htm create mode 100644 themes/berkarar/partials/home/map.htm diff --git a/plugins/janvince/smallcontactform/components/smallcontactform/scf-form.htm b/plugins/janvince/smallcontactform/components/smallcontactform/scf-form.htm index aa1afb1..802ee58 100644 --- a/plugins/janvince/smallcontactform/components/smallcontactform/scf-form.htm +++ b/plugins/janvince/smallcontactform/components/smallcontactform/scf-form.htm @@ -75,7 +75,8 @@ - +993 12 46-87-87 + + +993 61 20-30-79
@@ -95,7 +96,7 @@
- + - +
diff --git a/plugins/tps/shops/controllers/Notification.php b/plugins/tps/shops/controllers/Notification.php new file mode 100644 index 0000000..41ed827 --- /dev/null +++ b/plugins/tps/shops/controllers/Notification.php @@ -0,0 +1,18 @@ + + + +
diff --git a/plugins/tps/shops/controllers/notification/config_form.yaml b/plugins/tps/shops/controllers/notification/config_form.yaml new file mode 100644 index 0000000..31f891c --- /dev/null +++ b/plugins/tps/shops/controllers/notification/config_form.yaml @@ -0,0 +1,10 @@ +name: Notification +form: $/tps/shops/models/notification/fields.yaml +modelClass: Tps\Shops\Models\Notification +defaultRedirect: tps/shops/notification +create: + redirect: 'tps/shops/notification/update/:id' + redirectClose: tps/shops/notification +update: + redirect: tps/shops/notification + redirectClose: tps/shops/notification diff --git a/plugins/tps/shops/controllers/notification/config_list.yaml b/plugins/tps/shops/controllers/notification/config_list.yaml new file mode 100644 index 0000000..17135bf --- /dev/null +++ b/plugins/tps/shops/controllers/notification/config_list.yaml @@ -0,0 +1,12 @@ +list: $/tps/shops/models/notification/columns.yaml +modelClass: Tps\Shops\Models\Notification +title: Notification +noRecordsMessage: 'backend::lang.list.no_records' +showSetup: true +showCheckboxes: true +recordsPerPage: 20 +toolbar: + buttons: list_toolbar + search: + prompt: 'backend::lang.list.search_prompt' +recordUrl: 'tps/shops/notification/update/:id' diff --git a/plugins/tps/shops/controllers/notification/create.htm b/plugins/tps/shops/controllers/notification/create.htm new file mode 100644 index 0000000..08f6963 --- /dev/null +++ b/plugins/tps/shops/controllers/notification/create.htm @@ -0,0 +1,46 @@ + + + + +fatalError): ?> + + 'layout']) ?> + +
+ formRender() ?> +
+ +
+
+ + + + + +
+
+ + + + +

fatalError)) ?>

+

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

fatalError) ?>

+ + +

+ + + +

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

fatalError)) ?>

+

+ \ No newline at end of file diff --git a/plugins/tps/shops/models/Notification.php b/plugins/tps/shops/models/Notification.php new file mode 100644 index 0000000..51217e1 --- /dev/null +++ b/plugins/tps/shops/models/Notification.php @@ -0,0 +1,27 @@ +engine = 'InnoDB'; + $table->increments('id')->unsigned(); + $table->timestamp('created_at')->nullable(); + $table->timestamp('updated_at')->nullable(); + $table->timestamp('deleted_at')->nullable(); + $table->string('title')->nullable(); + $table->text('message')->nullable(); + }); + } + + public function down() + { + Schema::dropIfExists('tps_shops_notification'); + } +} diff --git a/plugins/tps/shops/updates/version.yaml b/plugins/tps/shops/updates/version.yaml index 5bc20c2..3964178 100644 --- a/plugins/tps/shops/updates/version.yaml +++ b/plugins/tps/shops/updates/version.yaml @@ -87,3 +87,6 @@ 1.0.30: - 'Updated table tps_shops_' - builder_table_update_tps_shops__12.php +1.0.31: + - 'Created table tps_shops_notification' + - builder_table_create_tps_shops_notification.php diff --git a/themes/berkarar/pages/map.htm b/themes/berkarar/pages/map.htm new file mode 100644 index 0000000..ccc63e4 --- /dev/null +++ b/themes/berkarar/pages/map.htm @@ -0,0 +1,32 @@ +title = "map" +url = "/map" +layout = "default" +is_hidden = 0 +== +
+
+
+
+ + + + + + + {{'Главная'|_}} + + +

+ {{'СХЕМА ТРЦ'|_}} +

+ +
+
+
+
+ +{% partial 'home/map' %} \ No newline at end of file diff --git a/themes/berkarar/pages/profile.htm b/themes/berkarar/pages/profile.htm index 9e4afc8..de08326 100644 --- a/themes/berkarar/pages/profile.htm +++ b/themes/berkarar/pages/profile.htm @@ -7,6 +7,14 @@ is_hidden = 0 security = "user" redirect = "home" == + +== {% component 'session' %} @@ -48,11 +56,17 @@ redirect = "home"

{{'Контактная информация'|_}}

+ +

+ {{'notification'|_}} +

+ {{'Выход'|_}} +
{% for detail in user.shop.reports %}
@@ -127,6 +141,34 @@ redirect = "home"
+ +
+ {% for notif in notifs %} +
+
+

+ {{notif.created_at|date("d.m.Y")}} +

+

+ {{notif.title}} +

+
+ + + + + + + + + + + {{'read.more'|_}} + +
+ {% endfor %} + +
diff --git a/themes/berkarar/pages/shop.htm b/themes/berkarar/pages/shop.htm index 07aedfb..eb560e0 100644 --- a/themes/berkarar/pages/shop.htm +++ b/themes/berkarar/pages/shop.htm @@ -16,6 +16,18 @@ function onStart(){ } ?> == +{% put styles %} + + + +{% endput %} +
@@ -64,6 +76,9 @@ function onStart(){
{{shop.floor}} {{'ЭТАЖ'|_}}
+
+ {{shop.shop_number}} +
+
+
+
+
+ +

+ {{'1 etazh'|_}} +

+

+ {{'2 etazh'|_}} +

+

+ {{'3 etazh'|_}} +

+

+ {{'4 etazh'|_}} +

+

+ {{'5 etazh'|_}} +

+
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+ \ No newline at end of file diff --git a/themes/berkarar/partials/home/movies.htm b/themes/berkarar/partials/home/movies.htm index baab8b0..34cb852 100644 --- a/themes/berkarar/partials/home/movies.htm +++ b/themes/berkarar/partials/home/movies.htm @@ -53,7 +53,7 @@ function onStart(){
{{movie.genras}}
-

@@ -72,7 +72,7 @@ function onStart(){ /> -

+ --> {% endfor %} diff --git a/themes/berkarar/partials/site/footer.htm b/themes/berkarar/partials/site/footer.htm index 4e34f7f..e3088e9 100644 --- a/themes/berkarar/partials/site/footer.htm +++ b/themes/berkarar/partials/site/footer.htm @@ -24,7 +24,7 @@

- {{'© 2022 «BERKARAR» ТРЦ'|_}} + {{'© 2024 «BERKARAR»'|_}}

@@ -98,7 +98,7 @@

- + @@ -117,7 +117,7 @@

- +993 12 46-87-87 + +993 61203079

@@ -125,4 +125,4 @@
- + \ No newline at end of file diff --git a/themes/berkarar/partials/site/navigation.htm b/themes/berkarar/partials/site/navigation.htm index 57fa87a..dd9c5e8 100644 --- a/themes/berkarar/partials/site/navigation.htm +++ b/themes/berkarar/partials/site/navigation.htm @@ -38,7 +38,7 @@ function onStart(){
  • - + @@ -208,7 +208,7 @@ function onStart(){

    - +     @@ -227,7 +227,7 @@ function onStart(){

    - +993 12 46-87-87 + +993 61203079

    @@ -236,4 +236,4 @@ function onStart(){ - + \ No newline at end of file