From 86171c2790dd2381d8894ad43761304851fa74eb Mon Sep 17 00:00:00 2001 From: gerchek Date: Mon, 25 Apr 2022 12:43:07 +0500 Subject: [PATCH] filter worked --- .../onlinecardcontroller/config_filter.yaml | 23 +++++-- .../onlinecardcontroller/config_list.yaml | 1 + plugins/atash/contact/models/OnlineCard.php | 13 ++++ .../contact/models/onlinecard/fields.yaml | 1 + plugins/atash/contact/plugin.yaml | 61 +++++++++++-------- plugins/vdomah/jwtauth/routes.php | 22 ++++--- plugins/vdomah/jwtauth/views/mail/message.htm | 1 - 7 files changed, 79 insertions(+), 43 deletions(-) diff --git a/plugins/atash/contact/controllers/onlinecardcontroller/config_filter.yaml b/plugins/atash/contact/controllers/onlinecardcontroller/config_filter.yaml index a1df2e4..7b9a106 100644 --- a/plugins/atash/contact/controllers/onlinecardcontroller/config_filter.yaml +++ b/plugins/atash/contact/controllers/onlinecardcontroller/config_filter.yaml @@ -1,6 +1,19 @@ scopes: - payed: - label: Payment - type: checkbox - default: 0 - conditions: payed = true \ No newline at end of file + created_at: + label: "Date filter" + type: daterange + conditions: created_at >= ':after' AND created_at <= ':before' + selected_card: + label: "Selected card" + type: text + conditions: selected_card like concat('%', :value, '%') + + + #selected_card: + # label: Holiday Type + # modelClass: Atash\Contact\Models\OnlineCard + # conditions: selected_card in (:filtered) + # options: + # "Aýlyk karty": "Aýlyk karty" + + \ No newline at end of file diff --git a/plugins/atash/contact/controllers/onlinecardcontroller/config_list.yaml b/plugins/atash/contact/controllers/onlinecardcontroller/config_list.yaml index 64b4f70..ab982f3 100644 --- a/plugins/atash/contact/controllers/onlinecardcontroller/config_list.yaml +++ b/plugins/atash/contact/controllers/onlinecardcontroller/config_list.yaml @@ -5,6 +5,7 @@ noRecordsMessage: 'backend::lang.list.no_records' showSetup: true showCheckboxes: true recordsPerPage: 20 +filter: config_filter.yaml toolbar: buttons: list_toolbar search: diff --git a/plugins/atash/contact/models/OnlineCard.php b/plugins/atash/contact/models/OnlineCard.php index de6bf54..8776a00 100644 --- a/plugins/atash/contact/models/OnlineCard.php +++ b/plugins/atash/contact/models/OnlineCard.php @@ -52,6 +52,19 @@ class OnlineCard extends Model ]; protected $guarded = ['*']; + #public function getHolidayTypesAttribute(){ + #return [ + # "Aýlyk karty" => 'Aýlyk karty' + # ]; +#} + + + + // public function scopeFieldFilter($query, $val) +//{ + // $id = FieldModel::where('selected_card','LIKE','%'.$val.'%')->lists('id'); + // return $query->whereIn('id', $id); +//} // public function scopePayed($query) // { diff --git a/plugins/atash/contact/models/onlinecard/fields.yaml b/plugins/atash/contact/models/onlinecard/fields.yaml index 83ef9ec..7de1d1d 100644 --- a/plugins/atash/contact/models/onlinecard/fields.yaml +++ b/plugins/atash/contact/models/onlinecard/fields.yaml @@ -3,6 +3,7 @@ fields: label: 'Saýlanan kart' span: auto type: text + # scope: fieldFilter name: label: 'First name' span: auto diff --git a/plugins/atash/contact/plugin.yaml b/plugins/atash/contact/plugin.yaml index fe66e20..952cadd 100644 --- a/plugins/atash/contact/plugin.yaml +++ b/plugins/atash/contact/plugin.yaml @@ -6,42 +6,49 @@ plugin: homepage: '' navigation: main-menu-item: - label: 'Online Card' - url: atash/contact/onlinecardcontroller - icon: icon-credit-card + label: Contact + url: atash/contact/contactcontroller + icon: icon-calendar permissions: - - online_card_form + - contact sideMenu: - side-menu-item: - label: 'Online Credit' - url: atash/contact/onlinecreditcontroller - icon: icon-indent - permissions: - - credit_form - side-menu-item2: - label: Contact - url: atash/contact/contactcontroller - icon: icon-calendar - permissions: - - contact_form side-menu-item3: label: 'Вид кредита' url: atash/contact/creditdatacontroller icon: icon-credit-card + permissions: + - creditdata side-menu-item4: label: 'Вид карты' url: atash/contact/carddatacontroller icon: icon-envelope + permissions: + - carddata + side-menu-item: + label: 'Online Card' + url: /atash/contact/onlinecardcontroller + icon: icon-credit-card + permissions: + - online_card_form + side-menu-item2: + label: 'Online Credit' + url: /atash/contact/onlinecreditcontroller + icon: icon-dedent + permissions: + - onlinecredit permissions: - contact_form: - tab: Other - label: Contact_Form - credit_form: - tab: Other - label: Credit_Form online_card_form: - tab: Other - label: Online_card_Form - online_card_branch_form: - tab: Other - label: Online_card_branch_Form + tab: other + label: online_card_form + creditdata: + tab: other + label: creditdata + carddata: + tab: other + label: carddata + onlinecredit: + tab: other + label: onlinecredit + contact: + tab: other + label: contact diff --git a/plugins/vdomah/jwtauth/routes.php b/plugins/vdomah/jwtauth/routes.php index 07f4d11..f3fc75e 100644 --- a/plugins/vdomah/jwtauth/routes.php +++ b/plugins/vdomah/jwtauth/routes.php @@ -375,31 +375,33 @@ Route::post('restore', function (Request $request) { $vars = [ 'name' => $name, 'subject' => $subject, - 'messsage' => $message + 'messsage' => $message, + 'type' => $type ]; - - if($type==true) + // dd($type); + if($subject == "Plastik kartlar" || $subject == "Пластиковые карты") { Mail::send('vdomah.jwtauth::mail.message', $vars, function($message) { - $message->to('gerchekgerchek1@gmail.com', 'Admin Person'); + $message->to('bank_kart@halkbank.gov.tm', 'Admin Person'); $message->subject('This is a reminder'); }); } - elseif($type==false) + + else { Mail::send('vdomah.jwtauth::mail.message', $vars, function($message) { - - $message->to('digital.tps2018@gmail.com', 'Admin Person'); + + $message->to('karzonline@halkbank.gov.tm', 'Admin Person'); $message->subject('This is a reminder'); - + }); - } + } - return Response::json(compact('data')); + return Response::json(compact('type')); })->middleware('\Tymon\JWTAuth\Middleware\GetUserFromToken'); diff --git a/plugins/vdomah/jwtauth/views/mail/message.htm b/plugins/vdomah/jwtauth/views/mail/message.htm index 0877764..1f2b466 100644 --- a/plugins/vdomah/jwtauth/views/mail/message.htm +++ b/plugins/vdomah/jwtauth/views/mail/message.htm @@ -1,4 +1,3 @@ -