Merge branch 'v2.0'

hrshadhin · Jun 2, 2019 · ab51782 · ab51782
2 parents 6791aa0 + 7417823
commit ab51782
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/database/migrations/2019_01_15_130708_create_templates_table.php b/database/migrations/2019_01_15_130708_create_templates_table.php
@@ -22,9 +22,6 @@ public function up()
             $table->timestamps();
             $table->softDeletes();
             $table->userstamps();
-
-
-            $table->foreign('role_id')->references('id')->on('roles');
         });
     }
 

diff --git a/resources/views/backend/administrator/templates/mail_and_sms/add.blade.php b/resources/views/backend/administrator/templates/mail_and_sms/add.blade.php
@@ -60,7 +60,7 @@
                                 <div class="col-md-4">
                                     <div class="form-group has-feedback">
                                         <label for="name">Name<span class="text-danger">*</span></label>
-                                        <input autofocus type="text" class="form-control" name="name" placeholder="title" value="@if($template){{ $template->name }}@else{{ old('name') }} @endif" required minlength="4" maxlength="255">
+                                        <input autofocus type="text" class="form-control" name="name" placeholder="title" value="@if($template){{ $template->name }}@else{{ old('name') }}@endif" required minlength="4" maxlength="255">
                                         <span class="fa fa-info form-control-feedback"></span>
                                         <span class="text-danger">{{ $errors->first('name') }}</span>
                                     </div>

diff --git a/routes/web.php b/routes/web.php
@@ -164,30 +164,30 @@
 
     // template
     //mail and sms
-    Route::get('administrator/template/mailandsms', 'AdministratorController@templateMailAndSmsIndex')
+    Route::get('administrator/template-mailandsms', 'AdministratorController@templateMailAndSmsIndex')
         ->name('administrator.template.mailsms.index');
-    Route::post('administrator/template/mailandsms', 'AdministratorController@templateMailAndSmsIndex')
+    Route::post('administrator/template-mailandsms', 'AdministratorController@templateMailAndSmsIndex')
         ->name('administrator.template.mailsms.destroy');
-    Route::get('administrator/template/mailandsms/create', 'AdministratorController@templateMailAndSmsCru')
+    Route::get('administrator/template-mailandsms/create', 'AdministratorController@templateMailAndSmsCru')
         ->name('administrator.template.mailsms.create');
-    Route::post('administrator/template/mailandsms/create', 'AdministratorController@templateMailAndSmsCru')
+    Route::post('administrator/template-mailandsms/create', 'AdministratorController@templateMailAndSmsCru')
         ->name('administrator.template.mailsms.store');
-    Route::get('administrator/template/mailandsms/edit/{id}', 'AdministratorController@templateMailAndSmsCru')
+    Route::get('administrator/template-mailandsms/edit/{id}', 'AdministratorController@templateMailAndSmsCru')
         ->name('administrator.template.mailsms.edit');
-    Route::post('administrator/template/mailandsms/update/{id}', 'AdministratorController@templateMailAndSmsCru')
+    Route::post('administrator/template-mailandsms/update/{id}', 'AdministratorController@templateMailAndSmsCru')
         ->name('administrator.template.mailsms.update');
     // id card
-    Route::get('administrator/template/idcard', 'AdministratorController@templateIdcardIndex')
+    Route::get('administrator/template-idcard', 'AdministratorController@templateIdcardIndex')
         ->name('administrator.template.idcard.index');
-    Route::post('administrator/template/idcard', 'AdministratorController@templateIdcardIndex')
+    Route::post('administrator/template-idcard', 'AdministratorController@templateIdcardIndex')
         ->name('administrator.template.idcard.destroy');
-    Route::get('administrator/template/idcard/create', 'AdministratorController@templateIdcardCru')
+    Route::get('administrator/template-idcard/create', 'AdministratorController@templateIdcardCru')
         ->name('administrator.template.idcard.create');
-    Route::post('administrator/template/idcard/create', 'AdministratorController@templateIdcardCru')
+    Route::post('administrator/template-idcard/create', 'AdministratorController@templateIdcardCru')
         ->name('administrator.template.idcard.store');
-    Route::get('administrator/template/idcard/edit/{id}', 'AdministratorController@templateIdcardCru')
+    Route::get('administrator/template-idcard/edit/{id}', 'AdministratorController@templateIdcardCru')
         ->name('administrator.template.idcard.edit');
-    Route::post('administrator/template/idcard/update/{id}', 'AdministratorController@templateIdcardCru')
+    Route::post('administrator/template-idcard/update/{id}', 'AdministratorController@templateIdcardCru')
         ->name('administrator.template.idcard.update');