xdelivery 0.2.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d92f2aaad01c0ebc7a226cbb22fc08b52d74c697
-  data.tar.gz: 070694f59a56765b20971805470f712704b74ded
+  metadata.gz: 32e729a05b87441921a17b67e77554b16d1115b0
+  data.tar.gz: 9a1734fc97bb1424e72cbf0b637d2ca2996cb592
 SHA512:
-  metadata.gz: dfa8a207525114da3d26f2268be95bbf4023ab3330cdeb796ec5518e2f4612844f5b76d82b1792531c170d9145f61445f8096165f19c3f0965e29f92c0ee6ee1
-  data.tar.gz: 0735a33a6509d8f53993287b667b6dd6da1dbb702813c54a3657cb4a760406cc412e3e53db43b89da3c31afba76c5521d9f36c0e096479fe8d92e04fe8157c7f
+  metadata.gz: f66bfcdad33a55d88e597c722995ad7611a5efea9af5dadcc17c1fcbebecb374b2c203f4c7446aba88bf390efb6364296e6347d0e4f1f27a053fb7a6244bb0a3
+  data.tar.gz: 8819f364dfa29f97ca66f4e44cc7cc0e76f71848b97a77d25e54ff3e0cde36a17701c9fda6182fd59ac28ecb5f948da25dda4267fdd7a607b91ab70e0778e435

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    xdelivery (0.2.3)
+    xdelivery (1.0.0)
       rest-client
 
 GEM

data/lib/xdelivery.rb

@@ -8,12 +8,12 @@ require "xdelivery/api/orders"
 require "xdelivery/api/sales"
 require "xdelivery/api/products"
 require "xdelivery/api/ping"
-require "xdelivery/api/invoice_settings"
+require "xdelivery/api/shops"
 require "xdelivery/api/response/base"
 require "xdelivery/api/response/orders"
 require "xdelivery/api/response/products"
 require "xdelivery/api/response/ping"
-require "xdelivery/api/response/invoice_settings"
+require "xdelivery/api/response/shops"
 
 
 module Xdelivery

data/lib/xdelivery/api/orders.rb

@@ -8,11 +8,11 @@ module Xdelivery
       COLUMNS = [
         :order_id, :provider, :recipient, :mobile, :email, :store_id, :store_name, :address,
         :items, :warehouse_items, :total_order_amount, :cash_on_delivery, :order_created_at,
-        :note, :callback_url, :ref_id, :tag, :merchant_note
+        :note, :callback_url, :ref_id, :tag, :merchant_note, :shop_id
       ]
 
       INVOICE_COLUMNS = [
-        :create_type, :email, :company_code, :company_title, :donate_code, :device_id, :device, :items, :invoice_setting_id
+        :create_type, :email, :company_code, :company_title, :donate_code, :device_id, :device, :items
       ]
 
       def add(params, invoice_params={})

data/lib/xdelivery/api/response/shops.rb

@@ -0,0 +1,20 @@
+module Xdelivery
+  module API
+    module Response
+      class Shops < Base
+
+        Shop = Struct.new(:id, :title, :pay2go_merchant_id, :default_shop)
+
+        def status?
+          auth?
+        end
+
+        def shops
+          data.map do |setting|
+            Shop.new(setting['id'], setting['title'], setting['pay2go_merchant_id'], setting['default_shop'])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/xdelivery/api/sales.rb

@@ -8,11 +8,11 @@ module Xdelivery
       COLUMNS = [
         :order_id, :recipient, :mobile, :email, :address,
         :items, :warehouse_items, :total_order_amount, :cash_on_delivery, :order_created_at,
-        :note, :callback_url, :ref_id, :tag, :tracking_code, :merchant_note
+        :note, :callback_url, :ref_id, :tag, :tracking_code, :merchant_note, :shop_id
       ]
 
       INVOICE_COLUMNS = [
-        :create_type, :email, :company_code, :company_title, :donate_code, :device_id, :device, :items, :invoice_setting_id
+        :create_type, :email, :company_code, :company_title, :donate_code, :device_id, :device, :items
       ]
 
       def add(params, invoice_params={})

data/lib/xdelivery/api/shops.rb

@@ -0,0 +1,9 @@
+module Xdelivery
+  module API
+    class Shops < Base
+      def get!
+        Response::Shops.new(get('/shops.json'))
+      end
+    end
+  end
+end

data/lib/xdelivery/client.rb

@@ -26,8 +26,8 @@ module Xdelivery
       api.update!
     end
 
-    def get_invoice_settings!
-      API::InvoiceSettings.new(merchant_no, access_key).get!
+    def get_shops!
+      API::Shops.new(merchant_no, access_key).get!
     end
 
     def ping!

data/lib/xdelivery/version.rb

@@ -1,3 +1,3 @@
 module Xdelivery
-  VERSION = "0.2.4"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xdelivery
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 1.0.0
 platform: ruby
 authors:
 - eddie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-31 00:00:00.000000000 Z
+date: 2019-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,16 +98,16 @@ files:
 - bin/setup
 - lib/xdelivery.rb
 - lib/xdelivery/api/base.rb
-- lib/xdelivery/api/invoice_settings.rb
 - lib/xdelivery/api/orders.rb
 - lib/xdelivery/api/ping.rb
 - lib/xdelivery/api/products.rb
 - lib/xdelivery/api/response/base.rb
-- lib/xdelivery/api/response/invoice_settings.rb
 - lib/xdelivery/api/response/orders.rb
 - lib/xdelivery/api/response/ping.rb
 - lib/xdelivery/api/response/products.rb
+- lib/xdelivery/api/response/shops.rb
 - lib/xdelivery/api/sales.rb
+- lib/xdelivery/api/shops.rb
 - lib/xdelivery/callback.rb
 - lib/xdelivery/client.rb
 - lib/xdelivery/version.rb

data/lib/xdelivery/api/invoice_settings.rb

@@ -1,9 +0,0 @@
-module Xdelivery
-  module API
-    class InvoiceSettings < Base
-      def get!
-        Response::InvoiceSettings.new(get('/invoice_settings.json'))
-      end
-    end
-  end
-end

data/lib/xdelivery/api/response/invoice_settings.rb

@@ -1,20 +0,0 @@
-module Xdelivery
-  module API
-    module Response
-      class InvoiceSettings < Base
-
-        Setting = Struct.new(:id, :title, :pay2go_merchant_id, :default_setting)
-
-        def status?
-          auth?
-        end
-
-        def settings
-          data.map do |setting|
-            Setting.new(setting['id'], setting['title'], setting['pay2go_merchant_id'], setting['default_setting'])
-          end
-        end
-      end
-    end
-  end
-end