moy_sklad 1.0.0.rc5 → 1.0.0.rc6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b698416490ac1da0fb6289d65129f0e6397fa16
-  data.tar.gz: 54e09002ed35a60d95eaee4a119ee56c33ca5dfe
+  metadata.gz: 4be84b202754491d098cb4ec782529e3c6cbbfa7
+  data.tar.gz: 33511ad471285e5f52bd9df811d8d42f9d174a78
 SHA512:
-  metadata.gz: 048a792d5669233a1dd79c545ffb8360303ceef359548237db50b95ddd030c5c87d09d67e223ded07e905a0a78b54efc08b4df3a0cb46e49ea4f076cb534fa73
-  data.tar.gz: cd921251602d3d39a37f56e95282d610d153bb3a1496f0b30a00eb756f3c1086d6294e33c775f99837bf556999beb1b8c9140ce7fec0a0ba75feb7577c4bb13b
+  metadata.gz: 0055d091beb1fcce3cda88a3608de2da1eab847b096d02a7f9ad1e863cc77953d9f2f6e57417f86450ed2caf53027dc2091e4f8d9f4b34d8fe1e7cdedf338d75
+  data.tar.gz: 7e860c291253194616f056e799263d424a6e30d25904a97516662209bac554c9c29afe9fa200449ef272638ed4b25512d64ed95d62e0ee94a13eccd4c5bee294

data/lib/moy_sklad/configuration.rb

@@ -68,17 +68,11 @@ module MoySklad
       MoySklad::Client::Base.warehouse_url = @warehouse_url = v
     end
 
-    # Currency UUID.
-    # @attr value [String] defaults to
-    # `'131bf5ff-1ee5-11e4-67ed-002590a28eca'`
-    attr_accessor :currency
-
     def initialize
       @user_name = ''
       @password = ''
       @base_url = 'https://online.moysklad.ru/exchange/rest/ms/xml'
       @warehouse_url = 'https://online.moysklad.ru/exchange/rest/stock/xml'
-      @currency = '131bf5ff-1ee5-11e4-67ed-002590a28eca'
     end
   end
 end

data/lib/moy_sklad/model/good.rb

@@ -1,11 +1,11 @@
 module MoySklad::Model
   class Good < MoySklad::Client::Base
-    def set_sale_price(type, value)
+    def set_sale_price(type, value, currency)
       create_nested_resource(:salePrices)
 
       v = self.salePrices.find_object(:price, :priceTypeUuid, type)
       if v.nil?
-        create_price(type, value)
+        create_price(type, value, currency)
       else
         v.value = value.to_i
       end
@@ -18,9 +18,8 @@ module MoySklad::Model
 
     private
 
-    def create_price(type, value)
-      options = { currencyUuid: MoySklad.configuration.currency,
-                  priceTypeUuid: type, value: value.to_i }
+    def create_price(type, value, currency)
+      options = { currencyUuid: currency, priceTypeUuid: type, value: value.to_i }
       p = create_and_load_resource('Price', options)
       if self.salePrices.price.is_a?(MoySklad::Client::Attribute::MissingAttr)
         self.salePrices.price = [p]

data/lib/moy_sklad/version.rb

@@ -1,3 +1,3 @@
 module MoySklad
-  VERSION = '1.0.0.rc5'
+  VERSION = '1.0.0.rc6'
 end

data/spec/ms_config.rb

@@ -4,6 +4,8 @@ TGT_AGENT = "uuid"
 SRC_STORE = "uuid"
 SRC_AGENT = "uuid"
 
+CURRENCY_CUR = "uuid"
+
 # Some known items from MS
 KNOWN_ITEMS = {
   "uuid" => {quantity: 2, name: "Библиотека открытая", price: 142560},

data/spec/unit/good_spec.rb

@@ -78,7 +78,7 @@ describe 'Good' do
         item = MoySklad::Model::Good.new
         item.name = "Test item with custom prices"
 
-        item.set_sale_price(PRICE_CUR, 100)
+        item.set_sale_price(PRICE_CUR, 100, CURRENCY_CUR)
 
         item.save
         @uuid = item.uuid
@@ -96,7 +96,7 @@ describe 'Good' do
       it "and update CUR price (only default price can be updated)" do
         item = MoySklad::Model::Good.find(@uuid)
 
-        item.set_sale_price(PRICE_CUR, 1000)
+        item.set_sale_price(PRICE_CUR, 1000, CURRENCY_CUR)
         expect(item.save).to eq(true)
 
         expect(item.get_sale_price(PRICE_CUR).value.to_f / 100).to eq(1000)
@@ -145,5 +145,4 @@ describe 'Good' do
 
     end
   end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moy_sklad
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc5
+  version: 1.0.0.rc6
 platform: ruby
 authors:
 - uno4ki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-09 00:00:00.000000000 Z
+date: 2015-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler