Merge branch 'develop' into 'master'

Develop

See merge request !11

application/app/Http/Controllers/Admin/FeedController.php

@@ -242,7 +242,7 @@ class FeedController extends AdminController
                           ->update(['show_feed' => $show_feed]);
                          
         return [
-            'status' => 'success',
+            'status' => 'Successfully updated.',
             'data' => 'done'
         ];
     }

application/app/Http/Controllers/Admin/HomepageController.php

@@ -107,6 +107,7 @@ class HomepageController extends AdminController
 
         if ($request->all()) { //dd($request->all());
             $show = trim($request->show);
+            $feed_csv_url = trim($request->feed_csv_url);
             $header_image_normal = trim($request->header_image_normal);
             $header_image_mobile = trim($request->header_image_mobile);
             $footer_image_normal = trim($request->footer_image_normal);
@@ -149,7 +150,7 @@ class HomepageController extends AdminController
                 }else{
                     $homepage->show_feed = '0';
                 }
-                
+                $homepage->feed_csv_url = $feed_csv_url;
                 $homepage->meta_title = $meta_title;
                 $homepage->meta_keyword = $meta_keyword;
                 $homepage->meta_description = $meta_description;

application/app/Http/Controllers/CronController.php

@@ -9,6 +9,7 @@ use App\Traits\Apitraits;
 use App\Locater;
 use App\Page;
 use App\City;
+use App\Homepage;
 use Illuminate\Support\Facades\Hash;
 use Illuminate\Support\Facades\Storage;
 //use App\Exports\UsersExport;
@@ -113,7 +114,10 @@ class CronController extends Controller
 
     public function import(Request $request) 
     {
-        $url = "https://m2admin.anitadongre.com/pub/custom_script/feeds/envigo/sheet/and-google-in.csv";
+        //$url = "https://m2admin.anitadongre.com/pub/custom_script/feeds/envigo/sheet/and-google-in.csv";
+        $getFeedUrl = Homepage::where('homepages.is_deleted', '=', '0')->get();
+        if(!empty($getFeedUrl)){
+            $url = $getFeedUrl[0]->feed_csv_url;
             $contents = file_get_contents($url);
             $name = substr($url, strrpos($url, '/') + 1);
             $data = Storage::put($name, $contents);
@@ -132,6 +136,11 @@ class CronController extends Controller
                 $request->session()->flash('error', $msg);
                 return redirect()->route('admin.feeds.feedSetting');
             }
+        }else{
+            $msg = 'Something went wrong!';
+            $request->session()->flash('error', $msg);
+            return redirect()->route('admin.feeds.feedSetting');
+        }
     }
 
 }
\ No newline at end of file

application/config/adminlte.php

@@ -197,7 +197,7 @@ return [
         ],
         'SETTINGS',
         [
-            'text'       => 'Manage Home Page',
+            'text'       => 'Settings',
             'url'         => 'admin/homepages',
             'icon_color' => 'red',
         ],

application/resources/views/admin/feeds/feeds_mng.blade.php

@@ -73,7 +73,7 @@
                                 <th style="width: 10px">#</th>
                                 <th>@sortablelink('feeds_id')</th>
                                 <th>@sortablelink('title')</th>
-                                <th>Feed Show</th>
+                                <th>Show</th>
                                 <th>@sortablelink('created_at')</th>
                                 <th style="width: 40px">Action</th>
                             </tr>
@@ -140,7 +140,8 @@ $(document).ready(function(){
             url: "{{route('admin.feeds.updateShowFeed')}}",
             data: {"_token": "{{ csrf_token() }}",id:id,showFeed:showFeed},
                 success: function (datanew) {
-                
+                $('.alert-success').html(datanew.status).fadeIn('slow');
+                $('.alert-success').delay(5000).fadeOut('slow');
             }
         });
     }

application/resources/views/admin/homepages/edit.blade.php

@@ -41,7 +41,7 @@
                             <!-- Custom Tabs -->
                             <div class="nav-tabs-custom">
                                 <ul class="nav nav-tabs">
-                                <li class="active"><a href="#other" data-toggle="tab" aria-expanded="true">Show Feed</a></li>
+                                <li class="active"><a href="#other" data-toggle="tab" aria-expanded="true">Feed</a></li>
                                 <li><a href="#tab_1" data-toggle="tab" aria-expanded="false">MAIN</a></li>
                                 <li class=""><a href="#tab_2" data-toggle="tab" aria-expanded="false">SEO</a></li>
                                 </ul>
@@ -60,6 +60,13 @@
                                         <br>
                                         </div>
                                     </div>
+                                    
+                                    <div class="form-group @if($errors->first('feed_csv_url')) {{' has-error has-feedback'}} @endif ">
+                                    <label for="inputError" style="text-align:left;" class="col-sm-2 control-label">Feed CSV Url</label>
+                                    <div class="col-sm-10">
+                                        <input type="text" name="feed_csv_url" class="form-control" placeholder="Feed CSV Url" value="{{old('feed_csv_url',@$data->feed_csv_url)}}">
+                                    </div>
+                                    </div>
                                 </div>
                                 <div class="tab-pane" id="tab_1">
                                     
@@ -144,45 +151,24 @@
                     color:red;
                 }
             </style>
-<script src="{{ asset('/vendor/adminlte/dist/js/slug.js') }}"></script>
 <script type="text/javascript">
     $( document ).ready(function() {
-    
       $('#add-pageform').validate({
-            ignore: ".ignore",
+            //ignore: ".ignore",
             rules: {
-                locater_id: "required",
-                title: "required",
-                //contents: "required",
-                status: "required",
-                //banner_image: "required",
-                banner_content: "required",
+                feed_csv_url: {
+                    required: true,
+                }
             },
             // Specify validation error messages
             messages: {
-                locater_id: "Please select locator",
-                title: "Please enter Name.",
-                //contents: "Please enter Description.",
-                status: "Please select Status.",
-                //banner_image: "Please enter Banner Image url.",
-                banner_content: "Please enter Meta Banner Content.",
+                feed_csv_url: {
+                    required: "Please enter Feed CSV Url.",
+                }
             },
         });
     });
     
-    $(function() {
-        $("#title").slug({ slug:'permalink',hide: false });
-        $('#edit_target_url').bind('click',function(){if ($('#target_url').attr('readonly') !== undefined) {
-        $('#target_url').removeAttr( "readonly");
-        } else {$('#target_url').attr('readonly','readonly')}
-        });
-        $('#target_url').bind('blur',function(){$(this).attr('readonly','readonly')});
-        
-    });
-</script>
-<script src="{{ asset('/vendor/unisharp/laravel-ckeditor/ckeditor.js') }}"></script>
-<script>
-    CKEDITOR.replace( 'contents' );
 </script>
 
 @endsection        
\ No newline at end of file

application/resources/views/admin/homepages/homepages_mng.blade.php

@@ -45,10 +45,10 @@
                                 <div class="col-sm-4">
                                     <button type="submit" class="btn btn-primary btn-info">Search<div></div></button>
                                     <a href="{{route('admin.homepages')}}" class="btn btn-primary btn-success">Reset</a>
-                                </div>-->
+                                </div>
                                 <div class="col-sm-2 pull-right">
                                     <a href="{{route('admin.homepages.add')}}" class="btn btn-block btn-warning">Add Homepages</a>
-                                </div>
+                                </div>-->
                             </div>
                         </form>
 
@@ -78,7 +78,7 @@
                                 <td>{{date("F j, Y", strtotime($row->created_at))}}</td>
                                 <td style="width:10%">
                                     <a href="{{route('admin.homepages.edit',['id'=>$row->id])}}" class="btn btn-info btn-xs action-btn" title ="Edit"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
-                                    <a href="{{route('admin.homepages.delete',['id'=>$row->id])}}" class="btn btn-danger btn-xs action-btn" onclick="return confirm('Are you sure you want to delete ?');" title ="Delete"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>
+                                    <!--<a href="{{route('admin.homepages.delete',['id'=>$row->id])}}" class="btn btn-danger btn-xs action-btn" onclick="return confirm('Are you sure you want to delete ?');" title ="Delete"><span class="glyphicon glyphicon-trash" aria-hidden="true"></span></a>-->
                                 </td>
                             </tr>
                             <?php $k++; ?>     

application/updatedquery.php

@@ -8,6 +8,8 @@ RUN on browser : WWW_ROOT./cron/getCity
 
 Run on CMD : composer require maatwebsite/excel
 
+/*19 August 2019*/
+
 ALTER TABLE `homepages` CHANGE `other_setting` `show_feed` VARCHAR(255) CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL;
 
 CREATE TABLE `locater_feeds` (
@@ -34,3 +36,14 @@ CREATE TABLE `locater_feeds` (
   `created_at` datetime DEFAULT NULL,
   `updated_at` datetime DEFAULT NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+ALTER TABLE `locater_feeds`
+ ADD PRIMARY KEY (`id`),
+ ADD UNIQUE KEY `id` (`id`);
+ALTER TABLE `locater_feeds`
+ MODIFY `id` bigint(20) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5055;
+
+
+/*20 August 2019*/
+
+ALTER TABLE `homepages` ADD `feed_csv_url` TEXT NULL COMMENT 'Only feed csv url' AFTER `show_feed`;
\ No newline at end of file