order2cb 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e2c5038c4f0f9ee2cc0f5c8a97a99c1d41800d2
-  data.tar.gz: 1affe00b1ec5ece28a35433fd60550e0e4d13782
+  metadata.gz: 4e2229ef56ffe3dffcc8bb7571eeecdeec190a73
+  data.tar.gz: f0186b07add7bfd68d170960568028398caa68ea
 SHA512:
-  metadata.gz: dae875b8bcdd8febfd4a7e3c54fdf2965ed170664cd64f9ecde65bf67cd64ea7d724bb40ccd70b696ab0d7d132e99dc377acbead818545f100222f54327e63e7
-  data.tar.gz: a13f50736bd1b88a7b76e2c668a2743825ea4b005dd4cffc64306491a01d937be9710353ef438f844cc3a0e42dc09205a6e82bcbe5d2891f1668d3b3ec29939e
+  metadata.gz: c21d5fe89634a66f7e7a16cd88fc3e9709d12c391953dc45c8febbad269a813f3da92793637d45fceee0577fce5efb8a09f379c04357b829a1a8b9469d23dfe2
+  data.tar.gz: 238176c656f5d32f6da34f4139f47b8456934296f0d7c2d9c3b5431d7411f8c902b9f32011f4252716fd1e39aafa3152525b590f578ec4b7ea6fce43c8dee98b

data/lib/order2cb/order.rb

@@ -84,7 +84,8 @@ module Order2cb
     end
 
     def short_codes
-      @data["short_code"].to_s.upcase.split("-")
+      sql = "SELECT short_code FROM exp_remote_line_items where order_id = #{@data["id"]};"
+      $db_client.query(sql).map{|row| row["short_code"].to_s.upcase.split("-")}.flatten.compact.uniq
     end
 
     def fitting_centre

data/lib/order2cb/version.rb

@@ -1,3 +1,3 @@
 module Order2cb
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/order2cb.rb

@@ -50,7 +50,7 @@ module Order2cb
       @logger.info "Starting processing orders from tyreshopper to caseblocks"
       until @stop
         begin
-          $db_client = Mysql2::Client.new(:host => @tyreshopperDatabaseHost, :username => @tyreshopperDatabaseUser, :password => @tyreshopperDatabasePassword, :database => @tyreshopperDatabaseName)
+          setup_db_client
           process_orders(all_recent_orders)
           $db_client.close
           @logger.debug "Waiting for #{@interval} seconds..."
@@ -73,6 +73,10 @@ module Order2cb
       @stop = true
     end
 
+    def setup_db_client
+      $db_client = Mysql2::Client.new(:host => @tyreshopperDatabaseHost, :username => @tyreshopperDatabaseUser, :password => @tyreshopperDatabasePassword, :database => @tyreshopperDatabaseName)
+    end
+
     def process_orders(orders_to_process)
       @logger.debug "Checking for orders"
       caseblocks = Caseblocks.new(@logger)
@@ -80,14 +84,14 @@ module Order2cb
         begin
           order = ::Order2cb::Order.find(order_number)
           unless caseblocks.order_exists?(order)
-            @logger.debug "#{order.number} doesn't exist in caseblocks, sending it now"
+            # @logger.debug "#{order.number} doesn't exist in caseblocks, sending it now"
             if caseblocks.create_order(order)
               @logger.info "Sent #{order.number} to caseblocks."
             else
               @logger.error "Failed to send #{order.number} to caseblocks."
             end
           else
-            @logger.debug "#{order.number} already exists in caseblocks... skipping."
+            # @logger.debug "#{order.number} already exists in caseblocks... skipping."
           end
         rescue => e
           @logger.error e.message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: order2cb
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - EmergeAdapt