Merge branch 'develop' into 'master'

Develop

See merge request !8

application/app/Http/Controllers/SearchController.php

@@ -122,7 +122,9 @@ class SearchController extends Controller
         $api_url = config('app.api_location');
         $locationDetailAPIdata = $this->call_api($api_url,$locatorID);
 
-        $feedDetail = LocaterFeed::where('locater_feeds.status', '=', '1')->take(6)->get();
+        $feedDetail = LocaterFeed::where('locater_feeds.status', '=', '1')
+                        ->where('locater_feeds.show_feed', '=', '1')
+                        ->get();
         
         return view('frontend.searchs.detail', compact('locatorID', 'locationDetailAPIdata', 'pageData', 'feedDetail'));
     }

application/public/vendor/frontend/css/custom.css

@@ -90,4 +90,75 @@ div#localitylist {
   }
   .col-md-7.col-lg-9.location_data-map {
         height: 612px;
-    }
\ No newline at end of file
+    }
+
+
+
+    button.slick-next, button.slick-next:hover {
+        position: absolute;
+        top: 50%;
+        right: -27px;
+        width: 21px;
+        height: 31px;
+        background-image: url("/left-right-arrow.png");
+        background-size: 40px;
+        outline: none;
+      }
+      button.slick-prev, button.slick-prev:hover {
+        position: absolute;
+        top: 50%;
+        left: -32px;
+        z-index: 1;
+        width: 21px;
+        height: 31px;
+        background-image: url("/left-right-arrow.png");
+        background-size: 40px;
+        background-position-x: right;
+        outline: none;
+      }
+      
+      
+      /* Arrows */
+      .slick-prev,
+      .slick-next
+      {
+          font-size: 0;
+          line-height: 0;
+      
+          position: absolute;
+          top: 50%;
+      
+          display: block;
+      
+          width: 20px;
+          height: 20px;
+          margin-top: -10px;
+          padding: 0;
+      
+          cursor: pointer;
+      
+          color: transparent;
+          border: none;
+          outline: none;
+          background: transparent;
+          outline: none!important;
+      }
+      /*.slick-prev:hover,
+      .slick-prev:focus,
+      .slick-next:hover,
+      .slick-next:focus
+      {
+          color: transparent;
+          outline: none;
+          background: transparent;
+      }
+      .slick-prev:hover:before,
+      .slick-prev:focus:before,
+      .slick-next:hover:before,
+      .slick-next:focus:before
+      {
+          opacity: 1;
+      }*/
+      
+      
+      
\ No newline at end of file

application/public/vendor/frontend/js/script.js

@@ -13,11 +13,11 @@ $(document).ready(function() {
     }
     if ($(".promotion-wrapper-items").length) {
         $(".promotion-wrapper-items").slick({
-            dots: true,
+            dots: false,
             infinite: true,
             speed: 300,
             slidesToShow: 5,
-            arrows: false,
+            arrows: true,
             responsive: [
 
                 {

application/resources/views/frontend/searchs/detail.blade.php

@@ -113,11 +113,11 @@
                     <?php foreach($feedDetail as $feed){ ?>
                 
                     <div class="item">
-                        <figure><img src="{{ $feed->image_link }}"> </figure>
+                        <figure><a href="{{ $feed->link }}" target="_blank"><img src="{{ $feed->image_link }}"> </a></figure>
                         <p class="name">{{ $feed->title }}</p>
                         <p class="currency bold">{{ $feed->price }}</p>
                         <p class="publisher">{{ $feed->brand }}</p>
-                        <p class="grey-txt">Price drop: {{ $feed->sale_price }}</p>
+                        <p class="grey-txt">Sale Price: {{ $feed->sale_price }}</p>
                     </div>
                     <?php } ?>
                 </section>

application/updatedquery.php

@@ -4,6 +4,31 @@ RUN on browser : WWW_ROOT./cron/getLocaterListData
 RUN on browser : WWW_ROOT./cron/getState
 RUN on browser : WWW_ROOT./cron/getCity 
 
+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;
 
-ALTER TABLE `locater_feeds` ADD `show_feed` TINYINT(4) NOT NULL DEFAULT '0' AFTER `id`;
\ No newline at end of file
+CREATE TABLE `locater_feeds` (
+  `id` bigint(20) NOT NULL,
+  `show_feed` tinyint(4) NOT NULL DEFAULT '0',
+  `feeds_id` varchar(100) DEFAULT NULL,
+  `title` varchar(255) DEFAULT NULL,
+  `description` text,
+  `gtin` varchar(100) DEFAULT NULL,
+  `brand` varchar(100) DEFAULT NULL,
+  `color` varchar(50) DEFAULT NULL,
+  `size` text,
+  `link` varchar(255) DEFAULT NULL,
+  `image_link` varchar(255) DEFAULT NULL,
+  `availability` varchar(50) DEFAULT NULL,
+  `product_condition` varchar(50) DEFAULT NULL,
+  `item_group_id` varchar(100) DEFAULT NULL,
+  `google_product_category` varchar(150) DEFAULT NULL,
+  `product_type` varchar(150) DEFAULT NULL,
+  `sale_price` varchar(100) DEFAULT NULL,
+  `price` varchar(100) DEFAULT NULL,
+  `status` tinyint(2) NOT NULL DEFAULT '1' COMMENT '0=active,1=inactive',
+  `is_deleted` tinyint(2) NOT NULL DEFAULT '0' COMMENT '1=deleted,0=notdeleted',
+  `created_at` datetime DEFAULT NULL,
+  `updated_at` datetime DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
\ No newline at end of file