order2cb 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1411a0b87f83b8fee806f6ab5b8d0fbfd3552fd5
-  data.tar.gz: 19c3d6652a0e5d40ad5017898624ab55bc2e50a4
+  metadata.gz: 9e24798c9b262f11776c50c656dcd68cd0ee7185
+  data.tar.gz: 291052893f52cf889588a2067504269de9188b08
 SHA512:
-  metadata.gz: 7b45fd83cd834eb8af43df5174f90db2d9c7730366d1fe7cdf6cb66187071fa0eb1fa56527d6279d68b7bbdc857a6f7dba673c2d57eeb2094e5fb446b40bc7c4
-  data.tar.gz: 67e153c1ce427c95a8eadc5118928e1efc43a2a21543aefaf87b9d8d4c2b599602b8f2bfadf17eaf1d736dce2c904ebbaf9709b8d5a662114c3272464165d0fc
+  metadata.gz: e9965a702c8e29f2507dff5e85fef6002d6c8f0ee90718dc875a4b45253754a26a087c90db59a46289500ae03a8c0e2a0d6de14be0aa09fa7a7165890ce8b503
+  data.tar.gz: db755db5ef24d31b12857f9d35ca88fa84d6eaf6052c50a58ed475587dfa53be8b2609721c32d00d589744c10c5df81d3e4b4aa05b8e1045d32ac5b13a8a65e2

data/bin/push_order

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby -Ilib
+require 'rubygems'
+
+# Prepares the $LOAD_PATH by adding to it lib directories of the gem and
+# its dependencies:
+require 'order2cb'
+
+oh = Order2cb::OrderHandler.new
+
+oh.push_orders(ARGV)

data/lib/order2cb/caseblocks.rb

@@ -14,8 +14,8 @@ module Order2cb
       false
     end
 
-    def order_exists?(order_no)
-      response = RestClient.get "#{ENV['CB_API_ENDPOINT']}/case_blocks/search.json?auth_token=#{ENV['CB_API_TOKEN']}&case_type_id=#{ENV['CB_TS_TYPE_ID']}&query=order_number:#{order_no}"
+    def order_exists?(order)
+      response = RestClient.get "#{ENV['CB_API_ENDPOINT']}/case_blocks/search.json?auth_token=#{ENV['CB_API_TOKEN']}&case_type_id=#{ENV['CB_TS_TYPE_ID']}&query=order_number:#{order.number}"
       response.code==200 && JSON.parse(response.body).count > 0
     rescue => e
       @logger.error e.message

data/lib/order2cb/order.rb

@@ -34,7 +34,7 @@ module Order2cb
     end
 
     def market_opt_in
-      @data['accept_marketing'] == true
+      @data['accept_marketing'] == 1
     end
 
     def payment_type
@@ -113,7 +113,7 @@ module Order2cb
       @operational_stock_order = true
 
       get_line_items.each do |line_item_row|
-        if @operational_stock_order && !line_item_row['is_operational_stock']
+        if line_item_row['is_operational_stock']==0
           @operational_stock_order = false
         end
         line_items_results << {

data/lib/order2cb/version.rb

@@ -1,3 +1,3 @@
 module Order2cb
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/order2cb.rb

@@ -51,7 +51,7 @@ module Order2cb
       until @stop
         begin
           $db_client = Mysql2::Client.new(:host => @tyreshopperDatabaseHost, :username => @tyreshopperDatabaseUser, :password => @tyreshopperDatabasePassword, :database => @tyreshopperDatabaseName)
-          process_orders
+          process_orders(all_recent_orders)
           $db_client.close
           @logger.debug "Waiting for #{@interval} seconds..."
         rescue => e
@@ -62,17 +62,24 @@ module Order2cb
       end
     end
 
+    def push_orders(order_numbers)
+      $db_client = Mysql2::Client.new(:host => @tyreshopperDatabaseHost, :username => @tyreshopperDatabaseUser, :password => @tyreshopperDatabasePassword, :database => @tyreshopperDatabaseName)
+      process_orders(order_numbers)
+      $db_client.close
+    end
+
+
     def stop
       @stop = true
     end
 
-    def process_orders
+    def process_orders(orders_to_process)
       @logger.debug "Checking for orders"
       caseblocks = Caseblocks.new(@logger)
-      orders_to_process.each do |order|
+      orders_to_process.each do |order_number|
         begin
-          order = ::Order2cb::Order.find(order['number'])
-          unless caseblocks.order_exists?(order.number)
+          order = ::Order2cb::Order.find(order_number)
+          unless caseblocks.order_exists?(order)
             @logger.debug "#{order.number} doesn't exist in caseblocks, sending it now"
             if caseblocks.create_order(order)
               @logger.info "Sent #{order.number} to caseblocks."
@@ -90,32 +97,11 @@ module Order2cb
 
     end
 
-    def orders_to_process(start_time = DateTime.parse(4.hours.ago.to_s))
+    def all_recent_orders(start_time = DateTime.parse(4.hours.ago.to_s))
       results = $db_client.query("SELECT * from exp_spree_orders where completed_at > '#{start_time}';")
       @logger.debug "Found #{results.count} completed orders in the last #{time_ago_in_words(start_time)} to be processed"
-      results
+      results.map{|row| row["number"]}
     end
 
-    def order_exists_in_casebocks
-      RestClient.get 'https://login.caseblocks/com/search', {:params => {:auth_token => @caseBlocksAPIToken, 'foo' => 'bar'}}
-      return false
-    end
-
-    def send_to_caseblocks(msgHash)
-      @logger.debug "Sending to CaseBlocks"
-
-      response = RestClient.post(add_auth(Uri.parse("#{@caseBlocksAPIEndpoint}/case_blocks/cases")), msgHash.to_json,
-                                 :content_type => :json,
-                                 :accept => :json,
-                                 "AUTH_TOKEN" => @caseBlocksAPIToken)
-      @logger.info "Received #{response.code} Location: #{response.headers[:location]}"
-    rescue RestClient::ExceptionWithResponse => ex
-      if ex.response.nil?
-        @logger.error "Received a bad response (null) from CaseBlocks. Re-raising."
-        raise ex
-      else
-        @logger.error "Received #{ex.response.code} bad response: #{ex.response.body}"
-      end
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: order2cb
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - EmergeAdapt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-17 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,6 +141,7 @@ email:
 - development@emergeadapt.com
 executables:
 - order2cb
+- push_order
 extensions: []
 extra_rdoc_files: []
 files:
@@ -153,6 +154,7 @@ files:
 - README.md
 - Rakefile
 - bin/order2cb
+- bin/push_order
 - lib/order2cb.rb
 - lib/order2cb/caseblocks.rb
 - lib/order2cb/order.rb