diff --git a/plugins/ahmadfatoni/apigenerator/controllers/api/CarddataController.php b/plugins/ahmadfatoni/apigenerator/controllers/api/cardController.php similarity index 93% rename from plugins/ahmadfatoni/apigenerator/controllers/api/CarddataController.php rename to plugins/ahmadfatoni/apigenerator/controllers/api/cardController.php index ce3d528..23d9a84 100644 --- a/plugins/ahmadfatoni/apigenerator/controllers/api/CarddataController.php +++ b/plugins/ahmadfatoni/apigenerator/controllers/api/cardController.php @@ -7,7 +7,7 @@ use Illuminate\Http\Request; use AhmadFatoni\ApiGenerator\Helpers\Helpers; use Illuminate\Support\Facades\Validator; use Atash\Contact\Models\Card_data; -class CarddataController extends Controller +class cardController extends Controller { protected $Card_data; @@ -22,8 +22,8 @@ class CarddataController extends Controller public function index(){ - $data = $this->Card_data->all()->toArray(); - +// $data = $this->Card_data->all()->toArray(); + $data = $this->Card_data->with(['translations:locale,model_id,attribute_data','image'])->get(); return $this->helpers->apiArrayResponseBuilder(200, 'success', $data); } @@ -96,4 +96,4 @@ class CarddataController extends Controller return call_user_func_array(array($this, $method), $parameters); } -} \ No newline at end of file +} diff --git a/plugins/ahmadfatoni/apigenerator/controllers/api/CreditdataController.php b/plugins/ahmadfatoni/apigenerator/controllers/api/creditController.php similarity index 87% rename from plugins/ahmadfatoni/apigenerator/controllers/api/CreditdataController.php rename to plugins/ahmadfatoni/apigenerator/controllers/api/creditController.php index 34a4a80..c58a6ac 100644 --- a/plugins/ahmadfatoni/apigenerator/controllers/api/CreditdataController.php +++ b/plugins/ahmadfatoni/apigenerator/controllers/api/creditController.php @@ -7,7 +7,7 @@ use Illuminate\Http\Request; use AhmadFatoni\ApiGenerator\Helpers\Helpers; use Illuminate\Support\Facades\Validator; use Atash\Contact\Models\Credit_data; -class CreditdataController extends Controller +class creditController extends Controller { protected $Credit_data; @@ -22,13 +22,9 @@ class CreditdataController extends Controller public function index(){ - // $data = $this->Credit_data->all()->toArray(); - // $data = $this->Credit_data->with(['translations:sum,securing_return,source_of_repayment,repayment_method'])->get(); - $data = $this->Credit_data->with(['translations:locale,model_id,attribute_data'])->get(); - +// $data = $this->Credit_data->all()->toArray(); + $data = $this->Credit_data->with(['translations:locale,model_id,attribute_data'])->get(); return $this->helpers->apiArrayResponseBuilder(200, 'success', $data); - - // return response()->json($data, 200); } public function show($id){ @@ -100,4 +96,4 @@ class CreditdataController extends Controller return call_user_func_array(array($this, $method), $parameters); } -} \ No newline at end of file +} diff --git a/plugins/ahmadfatoni/apigenerator/routes.php b/plugins/ahmadfatoni/apigenerator/routes.php index 4611e9b..217e74a 100644 --- a/plugins/ahmadfatoni/apigenerator/routes.php +++ b/plugins/ahmadfatoni/apigenerator/routes.php @@ -4,7 +4,7 @@ Route::post('fatoni/generate/api', array('as' => 'fatoni.generate.api', 'uses' = Route::post('fatoni/update/api/{id}', array('as' => 'fatoni.update.api', 'uses' => 'AhmadFatoni\ApiGenerator\Controllers\ApiGeneratorController@updateApi')); Route::get('fatoni/delete/api/{id}', array('as' => 'fatoni.delete.api', 'uses' => 'AhmadFatoni\ApiGenerator\Controllers\ApiGeneratorController@deleteApi')); -Route::resource('api/v1/credit_data', 'AhmadFatoni\ApiGenerator\Controllers\API\Credit dataController', ['except' => ['destroy', 'create', 'edit']]); -Route::get('api/v1/credit_data/{id}/delete', ['as' => 'api/v1/credit_data.delete', 'uses' => 'AhmadFatoni\ApiGenerator\Controllers\API\Credit dataController@destroy']); -Route::resource('api/v1/card_data', 'AhmadFatoni\ApiGenerator\Controllers\API\CarddataController', ['except' => ['destroy', 'create', 'edit']]); -Route::get('api/v1/card_data/{id}/delete', ['as' => 'api/v1/card_data.delete', 'uses' => 'AhmadFatoni\ApiGenerator\Controllers\API\CarddataController@destroy']); \ No newline at end of file +Route::resource('api/v1/card_data', 'AhmadFatoni\ApiGenerator\Controllers\API\cardController', ['except' => ['destroy', 'create', 'edit']]); +Route::get('api/v1/card_data/{id}/delete', ['as' => 'api/v1/card_data.delete', 'uses' => 'AhmadFatoni\ApiGenerator\Controllers\API\cardController@destroy']); +Route::resource('api/v1/credit_data', 'AhmadFatoni\ApiGenerator\Controllers\API\creditController', ['except' => ['destroy', 'create', 'edit']]); +Route::get('api/v1/credit_data/{id}/delete', ['as' => 'api/v1/credit_data.delete', 'uses' => 'AhmadFatoni\ApiGenerator\Controllers\API\creditController@destroy']); \ No newline at end of file diff --git a/plugins/atash/contact/models/credit_data/fields.yaml b/plugins/atash/contact/models/credit_data/fields.yaml index 20dea72..d2b3b78 100644 --- a/plugins/atash/contact/models/credit_data/fields.yaml +++ b/plugins/atash/contact/models/credit_data/fields.yaml @@ -13,9 +13,8 @@ tabs: tab: Data sum: label: 'Сумма кредита' - size: small - span: right - type: textarea + span: auto + type: number tab: Data bet: label: Ставка diff --git a/plugins/atash/contact/updates/builder_table_update_atash_contact_credit_data.php b/plugins/atash/contact/updates/builder_table_update_atash_contact_credit_data.php new file mode 100644 index 0000000..b2f147a --- /dev/null +++ b/plugins/atash/contact/updates/builder_table_update_atash_contact_credit_data.php @@ -0,0 +1,23 @@ +dropColumn('sum'); + }); + } + + public function down() + { + Schema::table('atash_contact_credit_data', function($table) + { + $table->string('sum', 191); + }); + } +} diff --git a/plugins/atash/contact/updates/builder_table_update_atash_contact_credit_data_2.php b/plugins/atash/contact/updates/builder_table_update_atash_contact_credit_data_2.php new file mode 100644 index 0000000..bc3694d --- /dev/null +++ b/plugins/atash/contact/updates/builder_table_update_atash_contact_credit_data_2.php @@ -0,0 +1,23 @@ +integer('sum'); + }); + } + + public function down() + { + Schema::table('atash_contact_credit_data', function($table) + { + $table->dropColumn('sum'); + }); + } +} diff --git a/plugins/atash/contact/updates/version.yaml b/plugins/atash/contact/updates/version.yaml index 0cb3bea..9067b69 100644 --- a/plugins/atash/contact/updates/version.yaml +++ b/plugins/atash/contact/updates/version.yaml @@ -75,3 +75,9 @@ 1.0.26: - 'Updated table atash_contact_card_data' - builder_table_update_atash_contact_card_data.php +1.0.27: + - 'Updated table atash_contact_credit_data' + - builder_table_update_atash_contact_credit_data.php +1.0.28: + - 'Updated table atash_contact_credit_data' + - builder_table_update_atash_contact_credit_data_2.php diff --git a/plugins/vdomah/jwtauth/routes.php b/plugins/vdomah/jwtauth/routes.php index 771ae9a..3c27654 100644 --- a/plugins/vdomah/jwtauth/routes.php +++ b/plugins/vdomah/jwtauth/routes.php @@ -285,7 +285,7 @@ Route::group(['prefix' => 'api'], function() { Mail::send('vdomah.jwtauth::mail.message', $vars, function($message) { - $message->to('gerchekgerchek1@gmail.com', 'Admin Person'); + $message->to('digital.tps2018@@gmail.com', 'Admin Person'); $message->subject('This is a reminder'); }); @@ -351,16 +351,16 @@ Route::group(['prefix' => 'api'], function() { 'date' => $date ]; - Mail::send('vdomah.jwtauth::mail.credit', $vars, function($message) use ($file) { + Mail::send('vdomah.jwtauth::mail.credit', $vars, function($message) { $message->to('digital.tps2018@gmail.com', 'Admin Person'); // $message->subject('This is a reminder'); - $message->attach( - $file->getRealPath(),array( - 'as'=>$file->getClientOriginalName(), - 'mime'=>$file->getMimeType() - ) - ); +// $message->attach( +// $file->getRealPath(),array( + // 'as'=>$file->getClientOriginalName(), + // 'mime'=>$file->getMimeType() + // ) + // ); }); diff --git a/plugins/vdomah/jwtauth/views/mail/card.htm b/plugins/vdomah/jwtauth/views/mail/card.htm index 6ff4a8b..0000367 100644 --- a/plugins/vdomah/jwtauth/views/mail/card.htm +++ b/plugins/vdomah/jwtauth/views/mail/card.htm @@ -1,217 +1,207 @@ - - - -
- -

- - Онлайн заявка для получения карты + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +

+ Онлайн заявка для получения карты +

+
+
+
+

+ Имя: +

+

+ {{name}} +

+
+
+
+

+ Фамилия: +

+

+ {{ surname }} +

+
+
+
+

+ Отчество: +

+

+ {{ middlename }} +

+
+
+
+

+ Дата рождения: +

+

+ {{ birthdate }} +

+
+
+
+

+ Мобильный телефон: +

+

+ {{ phone_number }} +

+
+
+
+

+ Домашний телефон: +

+

+ {{ home_phone_number }} +

+
+
+
+

+ Эл. адрес: +

+

+ {{ email }} +

+
+
+
+

+ Серия паспорта: +

+

+ {{ passport_series }} +

+
+
+
+

+ Кем выдан паспорт: +

+

+ {{ passport_by }} +

+
+
+
+

+ Адрес прописки: +

+

+ {{ place_of_residence }} +

+
+
+
+

+ Регион: +

+

+ {{ region }} +

+
+
+
+

+ Филиал: +

+

+ {{ branch }} +

+
+
+
+

+ Дата прихода в банк: +

+

+ {{ date_arrival_bank }} +

+
+
+
+

+ Выбранное время: +

+

+ {{ selected_time }} +

+
+
+
+

+ Кодовое слово: +

+

+ {{ the_codeword }} +

+
+
-

-
- - - + - - - -
-

- Имя: -

-

- {{name}} -

-
- - - - - -
-

- Фамилия: -

-

- {{ surname }} -

-
- - - - - -
-

- Отчество: -

-

- {{ middlename }} -

-
- - - - - -
-

- Дата рождения: -

-

- {{ birthdate }} -

-
- - - - - -
-

- Мобильный телефон: -

-

- {{ phone_number }} -

-
- - - - - -
-

- Домашний телефон: -

-

- {{ home_phone_number }} -

-
- - - - - -
-

- Эл. адрес: -

-

- {{ email }} -

-
- - - - - -
-

- Серия паспорта: -

-

- {{ passport_series }} -

-
- - - - - -
-

- Кем выдан паспорт: -

-

- {{ passport_by }} -

-
- - - - - -
-

- Адрес прописки: -

-

- {{ place_of_residence }} -

-
- - - - - -
-

- Регион: -

-

- {{ region }} -

-
- - - - - -
-

- Филиал: -

-

- {{ branch }} -

-
- - - - - -
-

- Дата прихода в банк: -

-

- {{ date_arrival_bank }} -

-
- - - - - -
-

- Выбранное время: -

-

- {{ selected_time }} -

-
- - - - - -
-

- Кодовое слово: -

-

- {{ the_codeword }} -

-
- - - - - - - diff --git a/plugins/vdomah/jwtauth/views/mail/credit.htm b/plugins/vdomah/jwtauth/views/mail/credit.htm index 1acfab7..71309e2 100644 --- a/plugins/vdomah/jwtauth/views/mail/credit.htm +++ b/plugins/vdomah/jwtauth/views/mail/credit.htm @@ -1,241 +1,229 @@ - - - -
- -

- - Онлайн-заявка для получения кредита + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +

+ Онлайн-заявка для получения кредита +

+
+
+
+

+ Имя: +

+

+ {{name}} +

+
+
+
+

+ Фамилия: +

+

+ {{ last_name }} +

+
+
+
+

+ Отчество: +

+

+ {{ middle_name }} +

+
+
+
+

+ Дата рождения: +

+

+ {{ birth }} +

+
+
+
+

+ Мобильный телефон: +

+

+ {{ mobile_phone }} +

+
+
+
+

+ Домашний телефон: +

+

+ {{ home_phone }} +

+
+
+
+

+ Эл. адрес: +

+

+ {{ email }} +

+
+
+
+

+ Серия паспорта: +

+

+ {{ passport_series }} +

+
+
+
+

+ Кем выдан паспорт: +

+

+ {{ passport_issued_by }} +

+
+
+
+

+ Адрес прописки: +

+

+ {{ addres }} +

+
+
+
+

+ Регион: +

+

+ {{ region }} +

+
+
+
+

+ Филиал: +

+

+ {{ branch }} +

+
+
+
+

+ Место работы: +

+

+ {{ place_of_work }} +

+
+
+
+

+ Сумма зарплаты: +

+

+ {{ amount_of_salary }} +

+
+
+
+

+ Должность: +

+

+ {{ position }} +

+
+
+
+

+ Стаж с последнего места работы: +

+

+ {{ work_experience }} +

+
+
+
+

+ Сумма зарплаты: +

+

+ {{ amount_of_salary }} +

+
+
-

-
- - - + - - - -
-

- Имя: -

-

- {{name}} -

-
- - - - - -
-

- Фамилия: -

-

- {{ last_name }} -

-
- - - - - -
-

- Отчество: -

-

- {{ middle_name }} -

-
- - - - - -
-

- Дата рождения: -

-

- {{ birth }} -

-
- - - - - -
-

- Мобильный телефон: -

-

- {{ mobile_phone }} -

-
- - - - - -
-

- Домашний телефон: -

-

- {{ home_phone }} -

-
- - - - - -
-

- Эл. адрес: -

-

- {{ email }} -

-
- - - - - -
-

- Серия паспорта: -

-

- {{ passport_series }} -

-
- - - - - -
-

- Кем выдан паспорт: -

-

- {{ passport_issued_by }} -

-
- - - - - -
-

- Адрес прописки: -

-

- {{ addres }} -

-
- - - - - -
-

- Регион: -

-

- {{ region }} -

-
- - - - - -
-

- Филиал: -

-

- {{ branch }} -

-
- - - - - -
-

- Место работы: -

-

- {{ place_of_work }} -

-
- - - - - -
-

- Сумма зарплаты: -

-

- {{ amount_of_salary }} -

-
- - - - - -
-

- Должность: -

-

- {{ position }} -

-
- - - - - -
-

- Стаж с последнего места работы: -

-

- {{ work_experience }} -

-
- - - - - -
-

- Сумма зарплаты: -

-

- {{ amount_of_salary }} -

-
- - - - - diff --git a/plugins/vdomah/jwtauth/views/mail/message.htm b/plugins/vdomah/jwtauth/views/mail/message.htm index cd1410e..0877764 100644 --- a/plugins/vdomah/jwtauth/views/mail/message.htm +++ b/plugins/vdomah/jwtauth/views/mail/message.htm @@ -1,6 +1,6 @@ - +
- +
@@ -21,10 +21,10 @@ @@ -33,64 +33,15 @@ - - - - - - - - - - - -
@@ -10,7 +10,7 @@

- Заявка на карту + Письмо

- Имя: + Тема письма

- admin + {{ subject }}

- Название организации: + Сообщение

- test + {{ messsage }}

-
-

- E-mail: -

-

- admin@gmail.com -

-
-
-
-

- Тема: -

-

- test -

-
-
-
-

- Сообщение: -

-

- test-test-test-test-test-test-test-test-test-test-test -

-
-
-
- - - - -
-
+
- diff --git a/themes/form/assets/images/logologo.png b/themes/form/assets/images/logologo.png new file mode 100644 index 0000000..7d1ba23 Binary files /dev/null and b/themes/form/assets/images/logologo.png differ