Merge branch 'develop' into 'master'

worked on feed

See merge request !9

application/app/Http/Controllers/CronController.php

@@ -124,13 +124,13 @@ class CronController extends Controller
             $data = Excel::import(new FeedsImport,$file);
             $msg = 'Feeds has been updated successfully.';
             $request->session()->flash('message', $msg);
-            return redirect()->route('admin.feedSetting');
+            return redirect()->route('admin.feeds.feedSetting');
 
         }else{
             
             $msg = 'Something went wrong!';
             $request->session()->flash('error', $msg);
-            return redirect()->route('admin.feedSetting');
+            return redirect()->route('admin.feeds.feedSetting');
         }
     }
 

application/updatedquery.php

@@ -4,6 +4,8 @@ RUN on browser : WWW_ROOT./cron/getLocaterListData
 RUN on browser : WWW_ROOT./cron/getState
 RUN on browser : WWW_ROOT./cron/getCity 
 
+/*12 August 2019*/
+
 Run on CMD : composer require maatwebsite/excel
 
 ALTER TABLE `homepages` CHANGE `other_setting` `show_feed` VARCHAR(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL;