smartkiosk-client 0.0.17 → 0.0.18

data/app/models/terminal.rb

@@ -15,6 +15,7 @@ class Terminal
   value :payment_in_progress, :global => true
 
   value :support_phone, :global => true
+  value :logo_url, :global => true
   value :providers_updates, :global => true, :marshal => true
 
   #

data/app/workers/ping_worker.rb

@@ -37,21 +37,35 @@ class PingWorker
           return
         end
 
-        unless Terminal.support_phone.value == response[:support_phone]
-          Terminal.support_phone = response[:support_phone]
-          Terminal.modified_at = DateTime.now
-        end
-
         Sidekiq::Logging.logger.info "Response: #{response.inspect}"
 
+        #
+        # PROFILE
+        #
+        unless Terminal.modified_at == response[:profile][:modified_at]
+          Terminal.support_phone = response[:profile][:support_phone]
+          Terminal.modified_at = response[:profile][:modified_at]
+          Sync::LogoWorker.perform_async response[:profile][:logo]
+        end
+
         #
         # ORDERS
         #
-        response[:orders].each do |order|
-          next unless Order.find_by_foreign_id(order[:id]).blank?
+        response[:orders].each do |foreign|
+          existing = Order.find_by_foreign_id(foreign[:id])
+
+          unless existing.nil?
+            if existing.foreign_created_at == foreign[:created_at] || # same order, not yet acknowleged
+               !existing.complete?                                    # not completed yet
+                next
+            end
+
+            existing.destroy
+          end
 
-          order[:foreign_id] = order.delete(:id)
-          order = Order.create!(order)
+          foreign[:foreign_id] = foreign.delete(:id)
+          foreign[:foreign_created_at] = foreign.delete(:created_at)
+          order = Order.create!(foreign)
 
           order.acknowledge
           order.perform

data/app/workers/sync/logo_worker.rb

@@ -0,0 +1,19 @@
+require 'rest-client'
+
+module Sync
+  class LogoWorker
+    include Sidekiq::Worker
+
+    sidekiq_options :retry => true, :queue => :sync
+
+    def perform(url)
+      if url.nil?
+        Terminal.logo_url = nil
+      else
+        uploader = IconUploader.new
+        uploader.download! "#{Terminal.config.host}/#{url}"
+        Terminal.logo_url = uploader.url
+      end
+    end
+  end
+end

data/config/boot.rb

@@ -80,7 +80,7 @@ module Smartkiosk
         Dir[File.expand_path "../../app/#{dir}/**/*.rb", __FILE__].each {|file| require file }
       end
 
-      CarrierWave.root = ->() { Application.public_folder }
+      CarrierWave.root = Application.public_folder
 
       self
     end

data/config/services/application.yml

@@ -1,4 +1,4 @@
 ---
 smartguard_host: druby://localhost:10000
 keyword: LOCAL
-host: http://localhost:3000
+host: http://admin.smartkiosk-mkb.rdlk.biz

data/db/migrate/20130106150707_create_orders.rb

@@ -1,12 +1,13 @@
 class CreateOrders < ActiveRecord::Migration
   def change
     create_table :orders do |t|
-      t.integer :foreign_id
-      t.string  :keyword
-      t.text    :args
-      t.string  :error
-      t.boolean :acknowledged
-      t.boolean :complete
+      t.integer  :foreign_id
+      t.datetime :foreign_created_at
+      t.string   :keyword
+      t.text     :args
+      t.string   :error
+      t.boolean  :acknowledged
+      t.boolean  :complete
 
       t.timestamps
     end

data/lib/smartkiosk/client/version.rb

@@ -2,6 +2,6 @@ require 'sinatra/base'
 
 module Smartkiosk
   class Client < Sinatra::Base
-    VERSION = '0.0.17'
+    VERSION = '0.0.18'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smartkiosk-client
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
   prerelease: 
 platform: ruby
 authors:
@@ -554,6 +554,7 @@ files:
 - app/workers/payments/pay_worker.rb
 - app/workers/ping_worker.rb
 - app/workers/sync/icons_worker.rb
+- app/workers/sync/logo_worker.rb
 - app/workers/sync/receipt_templates_worker.rb
 - bin/smartkiosk-client
 - config/boot.rb
@@ -606,7 +607,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1513265429066480138
+      hash: -4222507669661345488
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -615,7 +616,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1513265429066480138
+      hash: -4222507669661345488
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24