cyberbiz_express 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a9edae61dab1775700368f1d90b4314d0c428906f2e738e3a1ff9bf35619bbf
-  data.tar.gz: ca365436a2d85a8256fb8049f648981bc37f78591347f989d87256d52f9bc80e
+  metadata.gz: ff1ad3ce920e07604d23e60c0cdfcb7e13deb3ebeb02fb8de56ccd09183659a0
+  data.tar.gz: 547d99cded94c62fb1b6bdeb736af8c49186c4203d5c89d520d91b427c54626d
 SHA512:
-  metadata.gz: 6ffed83905c258093ee17d2816421499a3cc54ba4cca7688f4312c1ca033f88aa00d1e8bf349741f67ff93640d6bf77d807fed695230ee1d32a8b61210238b2e
-  data.tar.gz: afcd8c3becf90b18f46e6c135e0478d795f64cb5201e22c844d0aec1355a536e660baa1807d6f45f8e307c1d1ed9c1cff1860b8be0e4c6c0f0138592d02ad6df
+  metadata.gz: ecdcc6ad805f4eaf1abe2d91c0ec1b813a430b3800e2aaa69cbe3107c04eab64d10c5ad9b6f5c9b169f996b1a6ac1fece73abfa777b2420e887ae3f07d0d1190
+  data.tar.gz: 29467a81ed6028be3853666c65ddaeb55804ff25988345a23fc1b0b068882f5e587c8838afc8c458cca8bbd9af2b15d788c001c843d0317e6fce38ad64f1c6cc

data/Gemfile.lock

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

data/lib/cyberbiz_express/ninja_van/api.rb

@@ -38,8 +38,7 @@ module CyberbizExpress
         response = https.request(request)
         record_result('submit_order', request, response)
 
-        json = JSON.parse(response.body)
-        handle_response(!json['requested_tracking_number'].nil?, json)
+        handle_response(true, response.body)
       end
 
       def update_order(order_number, _shipping_address)
@@ -113,71 +112,73 @@ 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['location'],
-              postcode: shipping_address['zip_code'],
+        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: line_items_hash(order['line_items']),
-          },
-        }
+          }
+        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)

data/lib/cyberbiz_express/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cyberbiz_express
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Roelly
@@ -30,6 +30,9 @@ 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-0.1.7.gem
 - cyberbiz_express.gemspec
 - lib/cyberbiz_express/express_base.rb
 - lib/cyberbiz_express/ninja_van/api.rb