cyberbiz_express 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a8eebdbbf5e74bdb00ea7e9ae8188a99b1fb09b8c83fb8c321fe817dde0e02d
-  data.tar.gz: '06950deabca5f10cb5ad814bec9a94f43c4b7b19ecd1cd4106abb36cf59e8c81'
+  metadata.gz: a2e487746160f17295776a990779e5cd882337c9a282c32683e8d3a60adc8c85
+  data.tar.gz: bb52e694bd34032fe3ec727efd412d4e5b4cc5b3b06254047bb6e5671863a45d
 SHA512:
-  metadata.gz: e435dd1bebab4dd535ed9593188aca8e637b195ebc6834627e10773e5b2b08576f790eb7f3abe38cbb2c115ba5efd1903fed91e0f47d6370c60c470adc7d61ec
-  data.tar.gz: 78cb28b6fec59c821b0fcc5e20337adaa72f9243a6925a9ef045e61f11b66796666ec44d0aef17cde12b81b3bd31b7f5ecf64f83c43cfe6a58adcfcdc2a8f789
+  metadata.gz: 296ede697ffeddcb2de2d25649cee47ae6f4af75f5ad9b636484bb25c272f1ac01031094dfa656ea25f1524f9d1bc1f26ae304e7d4ac043749deb89162514125
+  data.tar.gz: 51dc713a4a6e2860ce2479c1ac7929e194dfc7a03358aab0327516fb862fa366b82f5135674ff917abc59046a97da5fdd2ef7e98cc97a0ca116e14673a79d976

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cyberbiz_express (0.1.5)
+    cyberbiz_express (0.1.7)
 
 GEM
   remote: https://rubygems.org/

data/lib/cyberbiz_express/ninja_van/api.rb

@@ -113,71 +113,78 @@ module CyberbizExpress
       end
 
       def submit_order_payload(shop, order, shipping_address, options)
-        {
-          marketplace: {
-            seller_id: shop['id'],
-            seller_company_name: shop['name'],
-          },
-          service_type: options['service_type'],
-          service_level: 'Standard',
-          requested_tracking_number: "CYB#{shop['id']}O#{order['number']}",
-          reference: {
-            merchant_order_number: "SHIP-CYB#{shop['id']}O#{order['number']}",
-          },
-          from: {
-            name: shop['name'],
-            phone_number: shop['phone'],
-            email: shop['email'],
-            address: {
-              address1: shop['address'],
-              area: shop['district'],
-              city: shop['city'],
-              state: shop['province'],
-              address_type: 'office',
-              country: shop['location'],
-              postcode: shop['zip_code'],
-            },
-          },
-          to: {
-            name: shipping_address['name'],
-            phone_number: shipping_address['phone'],
-            email: order['email'],
-            address: {
-              address1: shipping_address['address1'],
-              address2: shipping_address['address2'],
-              area: shipping_address['district'],
-              city: shipping_address['city'],
-              state: shipping_address['province'],
-              address_type: 'home',
-              country: shipping_address['country'],
-              postcode: shipping_address['zip'],
+        payload =
+          {
+            service_type: options['service_type'],
+            service_level: 'Standard',
+            requested_tracking_number: "CYB#{shop['id']}O#{order['number']}",
+            reference: {
+              merchant_order_number: "SHIP-CYB#{shop['id']}O#{order['number']}",
             },
-          },
-          parcel_job: {
-            is_pickup_required: true,
-            pickup_service_type: 'Scheduled',
-            pickup_service_level: 'Standard',
-            pickup_date: options['pickup_date'],
-            pickup_timeslot: {
-              start_time: options['pickup_start_time'],
-              end_time: options['pickup_end_time'],
-              timezone: 'Asia/Kuala_Lumpur',
+            from: {
+              name: shop['name'],
+              phone_number: shop['phone'],
+              email: shop['email'],
+              address: {
+                address1: shop['address'],
+                area: shop['district'],
+                city: shop['city'],
+                state: shop['province'],
+                address_type: 'office',
+                country: shop['location'],
+                postcode: shop['zip_code'],
+              },
             },
-            pickup_instructions: options['pickup_instructions'],
-            delivery_instructions: options['delivery_instructions'],
-            delivery_start_date: options['delivery_date'],
-            delivery_timeslot: {
-              start_time: options['delivery_start_time'],
-              end_time: options['delivery_end_time'],
-              timezone: 'Asia/Kuala_Lumpur',
+            to: {
+              name: shipping_address['name'],
+              phone_number: shipping_address['phone'],
+              email: order['email'],
+              address: {
+                address1: shipping_address['address1'],
+                address2: shipping_address['address2'],
+                area: shipping_address['district'],
+                city: shipping_address['city'],
+                state: shipping_address['province'],
+                address_type: 'home',
+                country: shipping_address['location'],
+                postcode: shipping_address['zip_code'],
+              },
             },
-            dimensions: {
-              weight: options['total_weight'],
+            parcel_job: {
+              is_pickup_required: true,
+              pickup_service_type: 'Scheduled',
+              pickup_service_level: 'Standard',
+              pickup_date: options['pickup_date'],
+              pickup_timeslot: {
+                start_time: options['pickup_start_time'],
+                end_time: options['pickup_end_time'],
+                timezone: 'Asia/Kuala_Lumpur',
+              },
+              pickup_instructions: options['pickup_instructions'],
+              delivery_instructions: options['delivery_instructions'],
+              delivery_start_date: options['delivery_date'],
+              delivery_timeslot: {
+                start_time: options['delivery_start_time'],
+                end_time: options['delivery_end_time'],
+                timezone: 'Asia/Kuala_Lumpur',
+              },
+              dimensions: {
+                weight: options['total_weight'],
+              },
+              insured_value: options['insured_value'],
+              items: line_items_hash(order['line_items']),
             },
-            insured_value: options['insured_value'],
-            items: order['line_items'].map { |item| { item_description: item['name'], quantity: item['quantity'] } },
-          },
-        }
+          }
+        if options['service_type'] == 'Marketplace'
+          payload.merge(marketplace: { seller_id: shop['id'], seller_company_name: shop['name'] })
+        else
+          payload
+        end
+      end
+
+      def line_items_hash(line_items)
+        line_items = line_items.map { |item| item.transform_keys(&:to_s) }
+        line_items.map { |item| { item_description: item['name'], quantity: item['quantity'] } }
       end
 
       def stringify_keys(hash)

data/lib/cyberbiz_express/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CyberbizExpress
-  VERSION = '0.1.5'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyberbiz_express
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Roelly
@@ -30,6 +30,8 @@ files:
 - bin/setup
 - cyberbiz_express-0.1.3.gem
 - cyberbiz_express-0.1.4.gem
+- cyberbiz_express-0.1.5.gem
+- cyberbiz_express-0.1.6.gem
 - cyberbiz_express.gemspec
 - lib/cyberbiz_express/express_base.rb
 - lib/cyberbiz_express/ninja_van/api.rb