spree_skroutz 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f30eeebfa435352569d376c5d3514953143e1a63fdec33b3340836d874dc08e4
-  data.tar.gz: cef6c7a6be8731fadc33d45116757ab62afce3d6c659f16d628bbe87abd5295b
+  metadata.gz: b92ba5a4a3916ea1e015256d338b783159f3cb54596bb6099ae9880bea4537ff
+  data.tar.gz: 8a98faeae92357eabf413c28a88f7e4512d47b495e79e61535815fce750d40cd
 SHA512:
-  metadata.gz: e524e70de7f420e827caa7b2b1dfd82762a5ab50bec4118778929000db67a96782768e8c13530f2af83c060321d4575a67e7e1987f019d63d1a192dc715b81eb
-  data.tar.gz: 3f3ff232f7cd98f8d3c9e4bf50cba311df4927f451d5257c33ba3be31787eb5d7b210e880aaa176e362b2aff82b1dd70688c9184d2aeacc67f507747461e11da
+  metadata.gz: 34180cd7892cc020771e4e9803bb15a75ab94428022b9535d378760f1464e577553f358939ab9361f98e3258a27ec83daac10bd01186c091d793f0bd68829f02
+  data.tar.gz: 208f785301f8d4146712369a5e8d4c670324c94cef69bbd0a4812e6b8e8013e301df4e27c98b10f3d051656e8d7056c5b89296ba9e3eeb870da4e986a2fe44dc

data/app/models/spree/integrations/skroutz.rb

@@ -1,6 +1,20 @@
 module Spree
   module Integrations
     class Skroutz < Spree::Integration
+      OUT_OF_STOCK_AVAILABILITY_OPTIONS = [
+        'Available from 4 to 6 days',
+        'Available up to 12 days'
+      ].freeze
+
+      AVAILABILITY_OPTIONS = [
+        'In Stock',
+        'Available from 1 to 3 days', 
+        *OUT_OF_STOCK_AVAILABILITY_OPTIONS
+      ].freeze
+
+      preference :express_delivery, :boolean, default: false
+      preference :default_availability, :string
+
       def self.integration_group
         'marketing'
       end

data/app/models/spree/product_decorator.rb

@@ -0,0 +1,13 @@
+module Spree
+  module ProductDecorator
+    def skroutz_availability
+      private_metadata['skroutz_availability'].presence
+    end
+
+    def skroutz_availability=(value)
+      self.private_metadata = private_metadata.merge('skroutz_availability' => value.presence)
+    end
+
+    Spree::Product.prepend self
+  end
+end

data/app/views/spree/admin/integrations/forms/_skroutz.html.erb

@@ -4,6 +4,15 @@
       <p>
         <%= Spree.t('admin.integrations.skroutz.description') %>
       </p>
+      <%= preference_field(@integration, form, 'express_delivery', i18n_scope: 'admin.integrations.skroutz') %>
+
+      <div class="form-group">
+        <%= form.label :preferred_default_availability, Spree.t('admin.integrations.skroutz.preferred_default_availability') %>
+        <%= form.select :preferred_default_availability,
+              options_for_select(Spree::Integrations::Skroutz::OUT_OF_STOCK_AVAILABILITY_OPTIONS, @integration.preferred_default_availability),
+              { include_blank: Spree.t('admin.integrations.skroutz.preferred_default_availability_none') },
+              { class: 'custom-select', data: { action: 'auto-submit#submit' } } %>
+      </div>
     </div>
   </div>
 </div>

data/app/views/spree/admin/products/_skroutz_availability.html.erb

@@ -0,0 +1,19 @@
+<div class="card mb-4">
+  <div class="card-header">
+    <h6 class="mb-0"><%= Spree.t('admin.integrations.skroutz.title') %></h6>
+  </div>
+  <div class="card-body">
+    <div class="form-group">
+      <%= f.label :skroutz_availability, Spree.t('admin.products.skroutz_availability') %>
+      <%= f.select :skroutz_availability,
+            options_for_select(
+              [[Spree.t('admin.products.skroutz_availability_default'), '']] +
+              Spree::Integrations::Skroutz::OUT_OF_STOCK_AVAILABILITY_OPTIONS,
+              product.skroutz_availability.to_s
+            ),
+            {},
+            { class: 'custom-select' } %>
+      <small class="form-text text-muted"><%= Spree.t('admin.products.skroutz_availability_hint') %></small>
+    </div>
+  </div>
+</div>

data/app/views/spree_skroutz/products.xml.builder

@@ -1,11 +1,20 @@
 xml.instruct! :xml, version: "1.0", encoding: "UTF-8"
 
+skroutz_integration = store_integration('skroutz')
+express_delivery = skroutz_integration&.preferred_express_delivery
+availability_in_stock = express_delivery ? "In Stock" : "Available from 1 to 3 days"
+default_availability = skroutz_integration&.preferred_default_availability.presence
+
 xml.mywebstore do
   cache [storefront_products_scope, current_currency] do
     xml.created_at Time.current.strftime("%Y-%m-%d %H:%M")
 
     xml.products do
       storefront_products_scope.find_each do |product|
+        in_stock = product.master.track_inventory && product.in_stock?
+        out_of_stock_availability = product.skroutz_availability.presence || default_availability
+        next if !in_stock && out_of_stock_availability.nil?
+
         xml.product do
           xml.tag! "id", product.id
 
@@ -44,7 +53,7 @@ xml.mywebstore do
             xml.tag! "vat", 0
           end
 
-          xml.tag! "availability", product.in_stock? ? "In stock" : "Out of stock"
+          xml.tag! "availability", in_stock ? availability_in_stock : out_of_stock_availability
 
           if product.brand_taxon.present?
             xml.tag! "manufacturer" do
@@ -83,7 +92,7 @@ xml.mywebstore do
               size_variants.each do |variant|
                 xml.variation do
                   xml.tag! "variationid", variant.id
-                  xml.tag! "availability", variant.in_stock? ? "In stock" : "Out of stock"
+                  xml.tag! "availability", variant.in_stock? ? availability_in_stock : out_of_stock_availability
                   xml.tag! "ean", variant.barcode if variant.barcode.present?
                   xml.tag! "price_with_vat", format('%.2f', variant.display_price.to_d)
 

data/config/initializers/spree.rb

@@ -1,3 +1,7 @@
 Rails.application.config.after_initialize do
   Spree.integrations << Spree::Integrations::Skroutz
+
+  Spree::PermittedAttributes.product_attributes.push(:skroutz_availability)
+
+  Rails.application.config.spree_admin.product_form_partials << 'spree/admin/products/skroutz_availability'
 end

data/config/locales/el.yml

@@ -6,3 +6,10 @@ el:
         skroutz:
           title: Skroutz
           description: Το Skroutz είναι εργαλείο για καταχωρίσεις προϊόντων στο Skroutz Merchants
+          express_delivery: Γρήγορη παράδοση
+          preferred_default_availability: Προεπιλεγμένη διαθεσιμότητα (εκτός αποθέματος)
+          preferred_default_availability_none: "Χωρίς προεπιλογή (τα εκτός αποθέματος εξαιρούνται)"
+      products:
+        skroutz_availability: Διαθεσιμότητα Skroutz (override)
+        skroutz_availability_default: Χρήση προεπιλογής καταστήματος
+        skroutz_availability_hint: Αντικαταστήστε την προεπιλεγμένη διαθεσιμότητα για αυτό το προϊόν όταν είναι εκτός αποθέματος ή δεν παρακολουθεί απόθεμα.

data/config/locales/en.yml

@@ -6,3 +6,10 @@ en:
         skroutz:
           title: Skroutz
           description: Skroutz is a channel integration for product listings on Skroutz Merchants
+          express_delivery: Express delivery
+          preferred_default_availability: Default availability (out of stock)
+          preferred_default_availability_none: "No default (out-of-stock products excluded)"
+      products:
+        skroutz_availability: Skroutz availability override
+        skroutz_availability_default: Use store default
+        skroutz_availability_hint: Override the store default availability for this product when out of stock or not tracking inventory.

data/lib/spree_skroutz/version.rb

@@ -1,5 +1,5 @@
 module SpreeSkroutz
-  VERSION = '1.1.3'.freeze
+  VERSION = '1.2.0'.freeze
 
   def gem_version
     Gem::Version.new(VERSION)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_skroutz
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - OlympusOne
@@ -91,7 +91,9 @@ files:
 - app/assets/images/integration_icons/skroutz-logo.webp
 - app/controllers/spree/skroutz_controller.rb
 - app/models/spree/integrations/skroutz.rb
+- app/models/spree/product_decorator.rb
 - app/views/spree/admin/integrations/forms/_skroutz.html.erb
+- app/views/spree/admin/products/_skroutz_availability.html.erb
 - app/views/spree_skroutz/products.xml.builder
 - config/initializers/spree.rb
 - config/locales/el.yml
@@ -107,10 +109,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/olympusone/spree_skroutz/issues
-  changelog_uri: https://github.com/olympusone/spree_skroutz/releases/tag/v1.1.3
+  changelog_uri: https://github.com/olympusone/spree_skroutz/releases/tag/v1.2.0
   documentation_uri: https://github.com/olympusone/spree_skroutz
   homepage_uri: https://github.com/olympusone/spree_skroutz
-  source_code_uri: https://github.com/olympusone/spree_skroutz/tree/v1.1.3
+  source_code_uri: https://github.com/olympusone/spree_skroutz/tree/v1.2.0
 rdoc_options: []
 require_paths:
 - lib