spree_elta_courier 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 395baab6c36f279e270abbaaa80ef0e6eecb2520d8d33dcdae61346d73c24008
-  data.tar.gz: e313ed63cabf500eeafbf874c974c6c8fd6c9ba589091045196a0f1261968b06
+  metadata.gz: 299aba1d364e609c4578085d0638d4c79ef57e189ab77d50b00b80576120e208
+  data.tar.gz: 1baef138576cd3836b195ec0c4fbe91c216eb4eabe083c6e781cd09b2812f4a9
 SHA512:
-  metadata.gz: b9fdac845b505ed658c36e8f5d1011c06c5a3dfb956cbadbdbbe69c27f7c2fb80974a4520294fe7e2f0a34c2860147f9dc1d52870f092801c10480f48b657238
-  data.tar.gz: e3d04145b3c5cd4ca3847d464ff08ed9f8e8cd4240437ed873abebb49dd6ebea44b3ed7f0d95cd49cf3edae8557e961f14832b861b3ac4e6a52c47ceeea218b9
+  metadata.gz: 696c147dbd40e9cb7014756e36c006bf4c7fc92c0c26d46db0c1e809d6e0f6622dae2976714d696f625a4087a6062d668fbd6f2c93992d366f2af898ca3793f7
+  data.tar.gz: 03b5341408f149e988b729fa8fdc9581ec71c440ed7a77d281e8a5b7c39bc8be87abce348ce4977cadaeaa6c1a0120dd408a1ec8b32e42bf1929414fcb2be79b

data/app/assets/config/spree_elta_courier_manifest.js

@@ -1 +1,3 @@
 //= link_tree ../images
+//= link spree_elta_courier/application.js
+//= link_tree ../../javascript/spree_elta_courier/controllers .js

data/app/controllers/spree/admin/elta_courier_controller.rb

@@ -9,25 +9,27 @@ module Spree
         begin
           load_order
 
+          num_packages = params[:num_packages].to_i || 1
+
           @order.shipments.each do |shipment|
             next unless shipment.can_create_voucher?
 
-            result = SpreeEltaCourier::CreateVoucher.new(shipment).call
+            result = SpreeEltaCourier::CreateVoucher.new(shipment, num_packages).call
+
+            vg_child = result[:vg_child].compact
 
-            shipment.update(
-              tracking: result[:vg_code]
-            )
+            shipment.tracking = result[:vg_code]
+            shipment.private_metadata['elta_courier.vg_child'] = vg_child
+            shipment.save!
           end
 
           flash[:success] = Spree.t('admin.integrations.elta_courier.voucher_successfully_created')
-          redirect_to spree.admin_order_path(@order)
         rescue ActiveRecord::RecordNotFound
           order_not_found
         rescue StandardError => e
           Rails.logger.error "Elta Courier Error: #{e.message}"
 
           flash[:error] = Spree.t('admin.integrations.elta_courier.voucher_creation_failed')
-          redirect_to spree.admin_order_path(@order)
         end
       end
 
@@ -35,8 +37,13 @@ module Spree
         begin
           load_order
 
-          voucher_numbers = @order.shipments.select(&:can_print_voucher?)
-                                  .map(&:tracking).compact
+          shipments = @order.shipments.select(&:can_print_voucher?)
+          
+          voucher_numbers = shipments.flat_map do |shipment|
+            vg_child = shipment.private_metadata['elta_courier.vg_child'] || []
+            
+            [shipment.tracking] + vg_child
+          end
 
           if voucher_numbers.empty?
             raise StandardError, Spree.t('admin.integrations.elta_courier.voucher_print_failed')
@@ -84,7 +91,6 @@ module Spree
 
       def order_not_found
         flash[:error] = flash_message_for(Spree::Order.new, :not_found)
-        redirect_to spree.admin_orders_path
       end
     end
   end

data/app/javascript/spree_elta_courier/application.js

@@ -0,0 +1,16 @@
+import '@hotwired/turbo-rails'
+import { Application } from '@hotwired/stimulus'
+
+let application
+
+if (typeof window.Stimulus === "undefined") {
+  application = Application.start()
+  application.debug = false
+  window.Stimulus = application
+} else {
+  application = window.Stimulus
+}
+
+import EltaCourierController from 'spree_elta_courier/controllers/elta_courier_controller'
+
+application.register('elta-courier', EltaCourierController)

data/app/javascript/spree_elta_courier/controllers/elta_courier_controller.js

@@ -0,0 +1,30 @@
+import { Controller } from "@hotwired/stimulus";
+import { post } from "@rails/request.js";
+
+export default class extends Controller {
+  static values = {
+    orderId: Number,
+    createVoucherPrompt: String,
+    createVoucherError: String,
+  };
+
+  async createVoucher(event) {
+    event.preventDefault();
+
+    const packages = window.prompt(this.createVoucherPromptValue, 1);
+
+    const numPackages = parseInt(packages, 10);
+    if (isNaN(numPackages) || numPackages <= 0) {
+      alert(this.createVoucherErrorValue);
+      return;
+    }
+
+    await post(`${Spree.adminPath}/elta_courier/${this.orderIdValue}/create`, {
+      body: {
+        num_packages: numPackages,
+      },
+    });
+
+    Turbo.visit(window.location.href, { action: "replace" });
+  }
+}

data/app/services/spree_elta_courier/create_voucher.rb

@@ -1,10 +1,12 @@
 module SpreeEltaCourier
   class CreateVoucher
-    attr_reader :order, :shipment, :client
+    attr_reader :shipment, :num_packages, :order, :client
 
-    def initialize(shipment)
-      @order = shipment.order
+    def initialize(shipment, num_packages = 1)
       @shipment = shipment
+      @num_packages = num_packages
+
+      @order = shipment.order
 
       @client = EltaCourier::SoapClient.new(:create)
     end
@@ -20,8 +22,8 @@ module SpreeEltaCourier
         'pel_paral_tk' => address.zipcode.gsub(/\s+/, ''),
         'pel_paral_thl_1' => address.phone,
         'pel_baros' => shipment.item_weight.to_f,
-        'pel_temaxia' => 1,
-        'pel_paral_sxolia' => order.special_instructions,
+        'pel_temaxia' => num_packages,
+        'pel_paral_sxolia' => shipment.special_instructions,
         'pel_ant_poso' => cod_payment ? shipment.final_price_with_items.to_f : 0,
         'pel_ref_no' => shipment.number,
         'sideta_eidos' => 2 # 1=Documents, 2=Parcel

data/app/views/spree_elta_courier/_head.html.erb

@@ -0,0 +1 @@
+<%= javascript_import_module_tag 'application-spree-elta-courier' %>

data/app/views/spree_elta_courier/_order_dropdown_options.html.erb

@@ -1,11 +1,16 @@
 <% if store_integration('elta_courier').present? %>
   <% if @order.can_create_voucher? %>
-    <%= link_to_with_icon 'package',
-      Spree.t('admin.integrations.elta_courier.create_voucher'),
-      spree.admin_elta_courier_create_path(@order.id),
-      class: 'btn text-left dropdown-item',
-      data: { turbo_method: :post, turbo_confirm: Spree.t(:are_you_sure) }
-    %>
+    <button
+      type="button"
+      class='btn text-left dropdown-item'
+      data-controller='elta-courier'
+      data-action='elta-courier#createVoucher'
+      data-elta-courier-order-id-value='<%= @order.id %>'
+      data-elta-courier-create-voucher-prompt-value="<%= Spree.t('admin.integrations.elta_courier.create_voucher_prompt') %>"
+      data-elta-courier-create-voucher-error-value="<%= Spree.t('admin.integrations.elta_courier.create_voucher_error') %>">
+      <%= icon 'package' %>
+      <%= Spree.t('admin.integrations.elta_courier.create_voucher') %>
+    </button>
   <% end %>
 
   <% if @order.can_print_voucher? %>

data/config/importmap.rb

@@ -0,0 +1,6 @@
+pin 'application-spree-elta-courier', to: 'spree_elta_courier/application.js', preload: false
+
+pin_all_from SpreeEltaCourier::Engine.root.join('app/javascript/spree_elta_courier/controllers'),
+  under:    'spree_elta_courier/controllers',
+  to:       'spree_elta_courier/controllers',
+  preload:  'application-spree-elta-courier'

data/config/initializers/spree.rb

@@ -2,5 +2,6 @@ Rails.application.config.after_initialize do
   Rails.application.config.spree.integrations << Spree::Integrations::EltaCourier
 
   # Admin partials
+  Rails.application.config.spree_admin.head_partials << 'spree_elta_courier/head'
   Rails.application.config.spree_admin.order_page_dropdown_partials << 'spree_elta_courier/order_dropdown_options'
 end

data/config/locales/el.yml

@@ -13,6 +13,8 @@ el:
           preferred_paper_size: Μέγεθος Χαρτιού
           create_voucher: Δημιουργία Voucher (Elta Courier)
           print_voucher: Εκτύπωση Voucher (Elta Courier)
+          create_voucher_prompt: "Εισάγετε αριθμό δεμάτων (ανά Αποστολή):"
+          create_voucher_error: Ο αριθμός των δεμάτων πρέπει να είναι θετικός ακέραιος αριθμός.
           voucher_successfully_created: Voucher δημιουργήθηκε επιτυχώς
           voucher_creation_failed: Αποτυχία δημιουργίας Voucher
           voucher_print_failed: Αποτυχία εκτύπωσης Voucher

data/config/locales/en.yml

@@ -13,6 +13,8 @@ en:
           preferred_paper_size: Paper Size
           create_voucher: Create Voucher (Elta Courier)
           print_voucher: Print Voucher (Elta Courier)
+          create_voucher_prompt: "Enter the number of package (per Shipment):"
+          create_voucher_error: The number of package must be a positive integer number.
           voucher_successfully_created: Voucher successfully created
           voucher_creation_failed: Voucher creation failed
           voucher_print: Voucher printing failed

data/lib/spree_elta_courier/engine.rb

@@ -14,9 +14,19 @@ module SpreeEltaCourier
     end
 
     initializer 'spree_elta_courier.assets' do |app|
+      app.config.assets.paths << root.join('app/javascript')
       app.config.assets.precompile += %w[spree_elta_courier_manifest]
     end
 
+    initializer 'spree_elta_courier.importmap', after: 'spree.admin.importmap' do |app|
+      app.config.spree_admin.importmap.draw(root.join('config/importmap.rb'))
+      app.config.spree_admin.cache_sweepers << root.join('app/javascript')
+    end
+
+    initializer 'spree_elta_courier.cache_sweeper', before: 'spree.admin.importmap.cache_sweeper' do |app|
+      app.config.spree_admin.cache_sweepers << root.join('app/javascript')
+    end
+
     def self.activate
       Dir.glob(File.join(File.dirname(__FILE__), '../../app/**/*_decorator*.rb')) do |c|
         Rails.configuration.cache_classes ? require(c) : load(c)

data/lib/spree_elta_courier/version.rb

@@ -1,5 +1,5 @@
 module SpreeEltaCourier
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.1.0'.freeze
 
   def gem_version
     Gem::Version.new(VERSION)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_elta_courier
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - OlympusOne
@@ -133,6 +133,8 @@ files:
 - app/assets/config/spree_elta_courier_manifest.js
 - app/assets/images/integration_icons/elta-courier-logo.png
 - app/controllers/spree/admin/elta_courier_controller.rb
+- app/javascript/spree_elta_courier/application.js
+- app/javascript/spree_elta_courier/controllers/elta_courier_controller.js
 - app/lib/elta_courier/soap_client.rb
 - app/models/spree/integrations/elta_courier.rb
 - app/models/spree/order_decorator.rb
@@ -140,7 +142,9 @@ files:
 - app/services/spree_elta_courier/create_voucher.rb
 - app/services/spree_elta_courier/print_vouchers.rb
 - app/views/spree/admin/integrations/forms/_elta_courier.html.erb
+- app/views/spree_elta_courier/_head.html.erb
 - app/views/spree_elta_courier/_order_dropdown_options.html.erb
+- config/importmap.rb
 - config/initializers/spree.rb
 - config/locales/el.yml
 - config/locales/en.yml
@@ -160,10 +164,10 @@ licenses:
 - AGPL-3.0-or-later
 metadata:
   bug_tracker_uri: https://github.com/olympusone/spree_elta_courier/issues
-  changelog_uri: https://github.com/olympusone/spree_elta_courier/releases/tag/v1.0.1
+  changelog_uri: https://github.com/olympusone/spree_elta_courier/releases/tag/v1.1.0
   documentation_uri: https://github.com/olympusone/spree_elta_courier
   homepage_uri: https://github.com/olympusone/spree_elta_courier
-  source_code_uri: https://github.com/olympusone/spree_elta_courier/tree/v1.0.1
+  source_code_uri: https://github.com/olympusone/spree_elta_courier/tree/v1.1.0
 rdoc_options: []
 require_paths:
 - lib