moy_sklad 1.0.0.beta1 → 1.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5daa533ba17369f57ab9a4395fd5f6bf17912d8
-  data.tar.gz: 9ea1ceb830cc2e6a3e99594188f9da7fcba2107f
+  metadata.gz: 0003b6f3f8990034da10eb5bba8256c4e155b78d
+  data.tar.gz: 861428d9afee9fcc7fbbea9514ffc794afc8a1b6
 SHA512:
-  metadata.gz: fbf0c19a234154d449e5fcdacff418d9074dd3b707b511cfb9dcb79a5518b594ad6f28cacbd865f8d245ff3c2c5daea4383dbad12ebb7775058e0108c3a35445
-  data.tar.gz: fea86256fbebb3e09c424372a187a352409e52c1fa4ee625a80be333d32b6b5cbc2a3f503690fbea2ebd96317d2276be8b2a0c587654116f4ada1d56232c82b7
+  metadata.gz: 0ab25dbeedd3313751d47c9aa11b7a331cf46681af2f199edfbf2737d5d75dd34fd155599ab1a10ac982b5d2d317c53297a68ae3e9bc317a367df2865a1d9c08
+  data.tar.gz: 1d209a77a948f99aac93a476f54b959b8f935c3e4a30615d2fc530ef8d2031ef366a884e1d62083c397c6ee40c5a7fcfc488574218b14bba1b03e03fc4186111

data/lib/moy_sklad/model/cash_in.rb

@@ -0,0 +1,9 @@
+module MoySklad::Model
+  class CashIn < MoySklad::Client::Base
+    def initialize(*args)
+      super(*args)
+      create_nested_collection(:attribute)
+      create_nested_resource(:sum)
+    end
+  end
+end

data/lib/moy_sklad/model/templates/cash_in.builder

@@ -0,0 +1,71 @@
+xml.cashIn(name: name, stateUuid: stateUuid, targetAgentUuid: targetAgentUuid, sourceAgentUuid: sourceAgentUuid, targetStoreUuid: targetStoreUuid,
+           sourceStoreUuid: sourceStoreUuid, applicable: applicable, projectUuid: projectUuid, contractUuid: contractUuid, moment: moment,
+           targetAccountUuid: targetAccountUuid, sourceAccountUuid: sourceAccountUuid, payerVat: payerVat, retailStoreUuid: retailStoreUuid,
+           currencyUuid: currencyUuid, rate: rate, vatIncluded: vatIncluded, employeeUuid: employeeUuid, expenseItemUuid: expenseItemUuid,
+           incomingDate: incomingDate, incomingNumber: incomingNumber, paymentPurpose: paymentPurpose, vatSum: vatSum,
+           commissionReportUuid: commissionReportUuid, customerOrderUuid: customerOrderUuid, factureOutUuid: factureOutUuid,
+           invoiceOutUuid: invoiceOutUuid, purchaseReturnUuid: purchaseReturnUuid) {
+
+  xml.accountUuid_  accountUuid
+  xml.accountId_    accountId
+  xml.uuid_         uuid
+  xml.groupUuid_    groupUuid
+  xml.deleted_      deleted
+  xml.code_         code
+  xml.externalcode_ externalcode
+  xml.description_  description
+
+  to_a(:attribute).each do |a|
+    xml.attribute(metadataUuid: a.metadataUuid, valueText: a.valueText, valueString: a.valueString,
+                  doubleValue: a.doubleValue, longValue: a.longValue, booleanValue: a.booleanValue,
+                  timeValue: a.timeValue, entityValueUuid: a.entityValueUuid, agentValueUuid: a.agentValueUuid,
+                  goodValueUuid: a.goodValueUuid, placeValueUuid: a.placeValueUuid, consignmentValueUuid: a.consignmentValueUuid,
+                  contractValueUuid: a.contractValueUuid, projectValueUuid: a.projectValueUuid, employeeValueUuid: a.employeeValueUuid,
+                  goodUuid: a.goodUuid) {
+
+      xml.accountUuid_  a.accountUuid
+      xml.accountId_    a.accountId
+      xml.uuid_         a.uuid
+      xml.groupUuid_    a.groupUuid
+      xml.deleted_      a.deleted
+
+      a.to_a(:file).each do |f|
+        xml.file(name: f.name, created: f.created, filename: f.filename, miniatureUuid: f.miniatureUuid) {
+
+          xml.accountUuid_  f.accountUuid
+          xml.accountId_    f.accountId
+          xml.uuid_         f.uuid
+          xml.groupUuid_    f.groupUuid
+          xml.deleted_      f.deleted
+          xml.code_         f.code
+          xml.externalcode_ f.externalcode
+          xml.description_  f.description
+          xml.contents_     f.contents
+        }
+      end
+    }
+  end
+
+  to_a(:document) do |d|
+    xml.document(name: d.name, created: d.created, filename: d.filename, miniatureUuid: d.miniatureUuid,
+                 emailedDate: d.emailedDate, publicId: d.publicId, operationUuid: d.operationUuid) {
+      xml.accountUuid_  d.accountUuid
+      xml.accountId_    d.accountId
+      xml.uuid_         d.uuid
+      xml.groupUuid_    d.groupUuid
+      xml.deleted_      d.deleted
+      xml.code_         d.code
+      xml.externalcode_ d.externalcode
+      xml.description_  d.description
+      xml.contents_     d.contents
+    }
+  end
+
+  xml.sum(sum: sum.sum, sumInCurrency: sum.sumInCurrency)
+
+  xml.demandsUuid {
+    to_a(:demandsUuid).each do |r|
+      xml.demandRef_ r
+    end
+  }
+}

data/lib/moy_sklad/model/templates/payment_in.builder

@@ -2,10 +2,9 @@ xml.paymentIn(name: name, stateUuid: stateUuid, targetAgentUuid: targetAgentUuid
               targetStoreUuid: targetStoreUuid, sourceStoreUuid: sourceStoreUuid, applicable: applicable, projectUuid: projectUuid,
               contractUuid: contractUuid, moment: moment, targetAccountUuid: targetAccountUuid, sourceAccountUuid: sourceAccountUuid,
               payerVat: payerVat, retailStoreUuid: retailStoreUuid, currencyUuid: currencyUuid, rate: rate, vatIncluded: vatIncluded,
-              created: created, createdBy: createdBy, employeeUuid: employeeUuid, expenseItemUuid: expenseItemUuid,
-              incomingDate: incomingDate, incomingNumber: incomingNumber, paymentPurpose: paymentPurpose, vatSum: vatSum,
-              commissionReportUuid: commissionReportUuid, customerOrderUuid: customerOrderUuid, factureOutUuid: factureOutUuid,
-              invoiceOutUuid: invoiceOutUuid, purchaseReturnUuid: purchaseReturnUuid) {
+              employeeUuid: employeeUuid, expenseItemUuid: expenseItemUuid, incomingDate: incomingDate, incomingNumber: incomingNumber,
+              paymentPurpose: paymentPurpose, vatSum: vatSum, commissionReportUuid: commissionReportUuid, customerOrderUuid: customerOrderUuid,
+              factureOutUuid: factureOutUuid, invoiceOutUuid: invoiceOutUuid, purchaseReturnUuid: purchaseReturnUuid) {
 
   xml.accountUuid_  accountUuid
   xml.accountId_    accountId

data/lib/moy_sklad/model.rb

@@ -10,4 +10,4 @@ require 'moy_sklad/model/custom_entity'
 require 'moy_sklad/model/country'
 require 'moy_sklad/model/supply'
 require 'moy_sklad/model/demand'
-
+require 'moy_sklad/model/cash_in'

data/lib/moy_sklad/version.rb

@@ -1,3 +1,3 @@
 module MoySklad
-  VERSION = '1.0.0.beta1'
+  VERSION = '1.0.0.beta2'
 end

data/spec/unit/cash_in_spec.rb

@@ -0,0 +1,120 @@
+require 'spec_helper'
+
+describe 'CashIn' do
+
+  describe :index do
+    it "should return list of payments" do
+      payments = MoySklad::Model::CashIn.find(:all)
+      expect(payments.metadata[:total]).to eq(payments.length)
+    end
+  end
+
+  describe :find do
+    it "should return payment" do
+      payment = MoySklad::Model::CashIn.new
+      payment.name = "test - payment"
+      payment.sum.sum = 1000 * 100
+      expect(payment.save).to eq(true)
+      expect(payment.uuid.length).to eq(36)
+
+      uuid = payment.uuid
+      payment = MoySklad::Model::CashIn.find(uuid)
+      expect(payment.name).to eq("test - payment")
+      expect(payment.sum.sum).to eq("100000.0")
+    end
+  end
+
+  describe :create do
+
+    it "should create new empty CashIn" do
+      payment = MoySklad::Model::CashIn.new
+      expect(payment.save).to eq(true)
+      expect(payment.uuid.length).to eq(36)
+      payment.destroy
+    end
+
+    it "should create new non-empty CashIn" do
+      payment = MoySklad::Model::CashIn.new
+      payment.name = "test - payment"
+      payment.sum.sum = 1000 * 100
+      expect(payment.save).to eq(true)
+      expect(payment.uuid.length).to eq(36)
+
+      uuid = payment.uuid
+      payment = MoySklad::Model::CashIn.find(uuid)
+      expect(payment.name).to eq("test - payment")
+      expect(payment.sum.sum).to eq("100000.0")
+      expect(payment.sum.sumInCurrency).to eq("100000.0")
+      payment.destroy
+
+      expect{MoySklad::Model::CashIn.find(uuid)}.to raise_error(ActiveResource::ResourceNotFound)
+    end
+
+    it "should create new order + payment", pending: 'need real data in config' do
+        order = MoySklad::Model::CustomerOrder.new
+        order.name = "Test with payment - API"
+        order.applicable = true
+        order.targetAgentUuid = TGT_AGENT
+        order.sourceStoreUuid = SRC_STORE
+        order.sourceAgentUuid = SRC_AGENT
+        order.stateUuid = CONFIRMED_UUID
+        order.sum.sum = "100"
+        order.sum.sumInCurrency = "100"
+
+        KNOWN_ITEMS.each do |id, info|
+          order.addItem(id, {quantity: info[:quantity],
+              basePrice: { sum: info[:price] * 100, sumInCurrency: info[:price] * 100},
+              price: { sum: info[:price] * 100, sumInCurrency: info[:price] * 100}})
+        end
+
+        ORDER_OPTIONS.each do |type, opt|
+          order.setAttribute({uuid: opt[:key], value: :entityValueUuid}, opt[:value])
+        end
+
+        expect(order.save).to eq(true)
+        expect(order.uuid.length).to eq(36)
+        uuid = order.uuid
+
+        payment = MoySklad::Model::CashIn.new
+        payment.sum.sum = order.sum.sum
+        payment.targetAgentUuid = TGT_AGENT
+        payment.sourceAgentUuid = SRC_AGENT
+        payment.describe = "Just a test"
+        payment.customerOrderUuid = uuid
+
+        expect(payment.save).to eq(true)
+        expect(payment.uuid.length).to eq(36)
+
+        # check order and bounded payment
+        order = MoySklad::Model::CustomerOrder.find(uuid)
+        expect(order.paymentsUuid.to_a(:financeInRef).first).to eq(payment.uuid)
+
+        # Order can be destroyed only after the payment
+        expect{order.destroy}.to raise_error(ActiveResource::ResourceNotFound)
+        payment.destroy
+        order.destroy
+    end
+
+    it "create payment and update applicable status", pending: 'need real data in config' do
+
+      payment = MoySklad::Model::CashIn.new
+      payment.targetAgentUuid = TGT_AGENT
+      payment.sourceAgentUuid = SRC_AGENT
+      payment.sum.sum = 1000 * 100
+      expect(payment.save).to eq(true)
+      uuid = payment.uuid
+
+      payment = MoySklad::Model::CashIn.find(uuid)
+      expect(payment.applicable).to eq("false")
+      payment.applicable = "true"
+      expect(payment.save).to eq(true)
+
+      payment = MoySklad::Model::CashIn.find(uuid)
+      expect(payment.applicable).to eq("true")
+
+      payment.destroy
+
+      expect{MoySklad::Model::CashIn.find(uuid)}.to raise_error(ActiveResource::ResourceNotFound)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moy_sklad
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta1
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - uno4ki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,6 +139,7 @@ files:
 - lib/moy_sklad/client/resource.rb
 - lib/moy_sklad/configuration.rb
 - lib/moy_sklad/model.rb
+- lib/moy_sklad/model/cash_in.rb
 - lib/moy_sklad/model/company.rb
 - lib/moy_sklad/model/country.rb
 - lib/moy_sklad/model/custom_entity.rb
@@ -149,6 +150,7 @@ files:
 - lib/moy_sklad/model/good_folder.rb
 - lib/moy_sklad/model/payment_in.rb
 - lib/moy_sklad/model/supply.rb
+- lib/moy_sklad/model/templates/cash_in.builder
 - lib/moy_sklad/model/templates/company.builder
 - lib/moy_sklad/model/templates/custom_entity.builder
 - lib/moy_sklad/model/templates/customer_order.builder
@@ -162,6 +164,7 @@ files:
 - moy_sklad.gemspec
 - spec/ms_config.rb
 - spec/spec_helper.rb
+- spec/unit/cash_in_spec.rb
 - spec/unit/company_spec.rb
 - spec/unit/country_spec.rb
 - spec/unit/custom_entity_spec.rb
@@ -199,6 +202,7 @@ summary: MoySklad API wrapper
 test_files:
 - spec/ms_config.rb
 - spec/spec_helper.rb
+- spec/unit/cash_in_spec.rb
 - spec/unit/company_spec.rb
 - spec/unit/country_spec.rb
 - spec/unit/custom_entity_spec.rb