czech_post_b2b_client 1.2.8 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3f8150daa70de566a1a90f4287c3bb29f1547e9269409e573b6e7521a446df5
-  data.tar.gz: 23a3271bcf33470fc45e85d4e1db58ee9ea192a864fc0266c887acc9a2d6b56b
+  metadata.gz: d3625c919136ebf4fa10070dee900b1491f19880a7cdc96c77cc5029e95ce09f
+  data.tar.gz: 4e66d3911f876a85215306b6ac21f6d2fc8629acae3aba75ca6b0a966af61468
 SHA512:
-  metadata.gz: bbd09471e42a1af7f0f4bb7e8c6c34309e083dd224ad392ae11a84ec15c1aebedc178782f944a51d5be678a455daa769171dc02e2bf4d8cf50d18d0f98c9c643
-  data.tar.gz: 84bdfde9c41917ffa85c0f191123aca5a6d8b6373907c4969d3bf38c65b8782e6d4466e912a3a0db48c258cf089ca8ca74ea7d5b27f421b5f0ff7ae5c6615b85
+  metadata.gz: f3b353230a9e87d89d81a093d970292001d357efb26dea1705d904c79061350eea2a7e3e38f843b6670604c0f6393877d07624059a1917d10fd3d3ecec93cb5c
+  data.tar.gz: ae7566f678cd5235daed64d53dac229f4a6352e44c303f88b9f39d29519416110e0f3faf042b46c7145dc9301da6e1208cd7fe9e373737f8530646eda859ff94

data/.rubocop.yml

@@ -13,7 +13,10 @@ AllCops:
     - "**/*.jb"
   Exclude:
     - "bin/*"
-Documentation:
+    - "documents/**/*"
+    - "test/fixtures/**/*"
+
+Style/Documentation:
   Enabled: false
 Layout/LineLength:
   Max: 140

data/CHANGELOG.md

@@ -2,8 +2,14 @@
 
 All changes to the gem are documented here.
 
+## [1.3.0] - 2022-04-07
+ - checked currently available  Print Templates codes
+ - enhanced address sheet printing with ability to print ZPL sheets (templates 200, 201 and 202).
+   Result of `AddressSheetGenerator` now have `pdf_content` and `zpl_content`.
+ - found new(?) API from Czech Post , see `documents/B2B-ZSKService-1.4.0.yaml` and https://www.ceskaposta.cz/napi/b2b.
+
 ## [1.2.8] - 2022-03-22
- - added new response codes
+  - added new response codes
 
 ## [1.2.6] - 2020-10-27
 

data/README.md

@@ -1,5 +1,11 @@
 
 # FRESH NEWS
+7.4.2022
+Finally there is some online documentation about nAPI of Czech post (https://www.ceskaposta.cz/napi/b2b)
+Not yet checked  if this is the same api we use or new one. Seems that authorization is different.
+
+
+26.8.2020
 After full usage in production (vyvolej.to, squared.one), we found that Czech POst have trouble with `parcelServiceSync` (maybe `sendParcels` too). When You try to register package with `:customs_documents`, you get `INVALID_BATCH` response with no error, but with `parcelCode`:
 ```
 <?xml version="1.0" encoding="UTF-8"?>

data/lib/czech_post_b2b_client/printing_templates.rb

@@ -9,6 +9,10 @@ module CzechPostB2bClient
     class Base
       class << self
         attr_reader :id, :description, :page_dimensions
+
+        def content_type
+          :pdf
+        end
       end
     end
 
@@ -132,12 +136,6 @@ module CzechPostB2bClient
       @page_dimensions = 'unverified'
     end
 
-    class CODVoucherForCSOB < Base
-      @id = 13
-      @description = 'Dobírková složenka ČSOB'
-      @page_dimensions = 'unverified'
-    end
-
     class RRLabels3x8 < Base
       @id = 26
       @description = 'štítky pro RR : 3x8'
@@ -175,29 +173,23 @@ module CzechPostB2bClient
         @page_dimensions = 'A5 landscape (210 × 148 mm)'
       end
 
-      class CN22FourOnPage < Base
-        @id = 74
-        @description = 'Celní prohlášení CN22 : 4x (A4)'
-        @page_dimensions = 'unverified A4'
-      end
-
-      class CN22WithCK < Base
-        @id = 75
-        @description = 'Celní prohlášení CN22 s ČK (A4)'
-        @page_dimensions = 'unverified A4'
-      end
-
-      class CN22WithCKFourOnPage < Base
-        @id = 76
-        @description = 'Celní prohlášení CN22 s ČK : 4x (A4)'
-        @page_dimensions = 'unverified A4'
-      end
-    end
-
-    class CN22FourOnPage < Base
-      @id = 74
-      @description = 'Celní prohlášení CN22 : 4x'
-      @page_dimensions = 'A4 portrait (210 × 297 mm)'
+      # class CN22FourOnPage < Base
+      #   @id = 74
+      #   @description = 'Celní prohlášení CN22 : 4x (A4)'
+      #   @page_dimensions = 'unverified A4'
+      # end
+
+      # class CN22WithCK < Base
+      #   @id = 75
+      #   @description = 'Celní prohlášení CN22 s ČK (A4)'
+      #   @page_dimensions = 'unverified A4'
+      # end
+
+      # class CN22WithCKFourOnPage < Base
+      #   @id = 76
+      #   @description = 'Celní prohlášení CN22 s ČK : 4x (A4)'
+      #   @page_dimensions = 'unverified A4'
+      # end
     end
 
     module HarmonizedLabel
@@ -232,20 +224,28 @@ module CzechPostB2bClient
         @description = 'Harmonizovaný štítek bianco - na výšku'
         @page_dimensions = 'A6 landscape (148 × 105 mm)'
       end
+    end
 
-      class ZebraBianco105x148 < Base
+    module ZebraLabel
+      class Base < CzechPostB2bClient::PrintingTemplates::Base
+        def self.content_type
+          :zpl
+        end
+      end
+
+      class Bianco105x148 < ZebraLabel::Base
         @id = 200
         @description = 'Harmonizovaný štítek bianco - (Zebra - 105x148); nejde o PDF'
         @page_dimensions = 'unverified 105 × 148 mm'
       end
 
-      class ZebraBianco100x150 < Base
+      class Bianco100x150 < ZebraLabel::Base
         @id = 201
         @description = 'Harmonizovaný štítek bianco - (Zebra - 100x150); nejde o PDF'
         @page_dimensions = 'unverified 100 × 150 mm'
       end
 
-      class ZebraBianco100x125 < Base
+      class Bianco100x125 < ZebraLabel::Base
         @id = 202
         @description = 'Harmonizovaný štítek bianco - (Zebra - 100x125); nejde o PDF'
         @page_dimensions = 'unverified 100 × 125 mm'
@@ -257,5 +257,12 @@ module CzechPostB2bClient
       base_class = CzechPostB2bClient::PrintingTemplates::Base
       ObjectSpace.each_object(base_class.singleton_class).reject { |c| c == base_class }
     end
+
+    def self.find(id)
+      klass = all_classes.detect { |k| k.id == id }
+      raise "PrintingTemplate with id: #{id}  is unknown!" unless klass
+
+      klass
+    end
   end
 end

data/lib/czech_post_b2b_client/response_parsers/get_parcels_printing_parser.rb

@@ -8,8 +8,8 @@ module CzechPostB2bClient
       def build_result
         super
         @result[:response][:state] = state_hash_from(printing_response_header_result['doPrintingStateResponse'])
-        @result[:printings] = { options: options_hash,
-                                pdf_content: pdf_content }
+        opt_hash = options_hash
+        @result[:printings] = { options: opt_hash }.merge(content_hash(opt_hash[:template_id]))
       end
 
       def options_hash
@@ -24,11 +24,23 @@ module CzechPostB2bClient
         }
       end
 
-      def pdf_content
-        pdf_content_encoded = response_root_node.dig('doPrintingDataResult', 'file')
-        return nil if pdf_content_encoded.nil?
+      def content_hash(template_id)
+        if zpl_template?(template_id)
+          { zpl_content: response_content.force_encoding('utf-8') }
+        else
+          { pdf_content: response_content }
+        end
+      end
+
+      def zpl_template?(template_id)
+        CzechPostB2bClient::PrintingTemplates.find(template_id).content_type == :zpl
+      end
+
+      def response_content
+        content_encoded = response_root_node.dig('doPrintingDataResult', 'file')
+        return nil if content_encoded.nil?
 
-        ::Base64.decode64(pdf_content_encoded)
+        ::Base64.decode64(content_encoded)
       end
 
       def response_root_node_name

data/lib/czech_post_b2b_client/services/address_sheets_generator.rb

@@ -5,7 +5,7 @@ module CzechPostB2bClient
     class AddressSheetsGenerator < CzechPostB2bClient::Services::Communicator
       attr_reader :parcel_codes, :options
 
-      AddressSheetsGeneratorResult = Struct.new(:pdf_content, :state_text, :state_code, keyword_init: true)
+      AddressSheetsGeneratorResult = Struct.new(:pdf_content, :zpl_content, :state_text, :state_code, keyword_init: true)
 
       def initialize(parcel_codes:, options: {})
         super()
@@ -41,6 +41,7 @@ module CzechPostB2bClient
 
       def build_result_from(response_hash)
         AddressSheetsGeneratorResult.new(pdf_content: response_hash.dig(:printings, :pdf_content),
+                                         zpl_content: response_hash.dig(:printings, :zpl_content),
                                          state_text: response_hash.dig(:response, :state, :text),
                                          state_code: response_hash.dig(:response, :state, :code))
       end

data/lib/czech_post_b2b_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CzechPostB2bClient
-  VERSION = '1.2.8'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: czech_post_b2b_client
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.3.0
 platform: ruby
 authors:
 - Petr Mlčoch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ox