shopapp 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47eeb7f79ba150148fc2f5ddd12490191c3df6ad7098c2978f9ba6419e8cdca5
-  data.tar.gz: d5013a0698aa23ff521b0da82e344ed8d6916cd76be5be64a512e21589773fda
+  metadata.gz: 49f5696249d271a1c19ddba0f9fc6619778f1a2e50ad17b9fa8c0c7d709d4832
+  data.tar.gz: 844680d5f91a98b0a8019552889632319f0e2999f0bd58a0e846bee55cf2307a
 SHA512:
-  metadata.gz: 76c237dbcc0d45cb458e0dba9f9bf186a20611e45e091b4c2c3661cb3d0045415ab0d18824af61e0a65aa57f9609ce013811dde9b1b8faa00fade5bd7bc5c590
-  data.tar.gz: 4157299fabd9eefce7944efaa6077432aff714b87987a1696b78ae9bbafb98b70bfcaab9f6c3483ed4c187afe799c377ab22da45f023b7fe999bfc89abbb1893
+  metadata.gz: 777ab542afd162169651992b6a7f4e7f5b27b2f50872ba9ac5892af7e95389eac005db2c1712c714978bc01feccbd605dbaa4414427556fda4c9b2b835f1dcde
+  data.tar.gz: 0a8c67173dda781cf9a887390a751cf68bf24ce5cff9fcd13dcd4d3224d0f33ed5bc0d7fce4333359f969b8271df50b635df7a3db955cf33d304acf8d6b082cb

data/app/controllers/concerns/shoplift_client.rb

@@ -132,6 +132,14 @@ module ShopliftClient
     end
   end
 
+  def handle_not_authorized(message)
+    if request.format.html?
+      redirect_unauthorized
+    else
+      fail ActionController::RoutingError, message
+    end
+  end
+
   def authenticate_company!(soft = false)
     return true if authenticate_user
 
@@ -145,7 +153,7 @@ module ShopliftClient
 
     if @api_key.blank?
       return false if soft
-      fail ActionController::RoutingError, 'Authentication token missing'
+      handle_not_authorized 'Authentication token missing'
     end
 
     response = srv.post 'auth/api_key',
@@ -156,7 +164,7 @@ module ShopliftClient
 
     if response.blank?
       return false if soft
-      fail ActionController::RoutingError, 'Request not authorized'
+      handle_not_authorized 'Request not authorized'
     end
 
     @authentication = JSON.parse response.body

data/app/views/shopapp/_shopapp.html.haml

@@ -19,13 +19,16 @@
                 %i.fa.fa-search.mx-4(aria-hidden="true")
     %ul.navbar-nav.ml-auto
       = render 'layouts/header_menu'
-      %li.nav-item.dropdown.ml-3
-        %a#navbarDropdown.nav-link.dropdown-toggle(href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false")
-          %i.fa.fa-th(aria-hidden="true")
-        .dropdown-menu.dropdown-menu-right(aria-labelledby="navbarDropdown")
-          -(@current_user_json_hash['company']['apps'] || []).each do |app|
-            - if app['home'].present?
-              %a.dropdown-item(href="#{app['home']}")=app['name']
+      - if @current_user_json_hash['company']['apps'].present?
+        %li.nav-item.dropdown.ml-3
+          %a#navbarDropdown.nav-link.dropdown-toggle(href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false")
+            %i.fa.fa-th(aria-hidden="true")
+          .dropdown-menu.dropdown-menu-right(aria-labelledby="navbarDropdown")
+            -(@current_user_json_hash['company']['apps'] || []).each do |app|
+              - if app['home'].present?
+                %a.dropdown-item(href="#{app['home']}")
+                  = image_tag "https://media.shoplift.fi/application_logos/#{app['name'].downcase}.svg", style: "padding-bottom: 3px; height: 24px;"
+                  = app['name'].capitalize
       %li.nav-item.dropdown.ml-md-2.ml-3.mr-3
         %a#navbarDropdown.nav-link.dropdown-toggle(href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false")
           %i.fa.fa-user(aria-hidden="true")
@@ -34,10 +37,15 @@
           .dropdown-header
             %strong Company:
             =@current_user_json_hash['company']['name']
+          - if (@current_user_json_hash['memberships'] || []).reject { |c| @current_user_json_hash['company']['code'] == c['code'] }.present?
+            .dropdown-divider
+            .dropdown-header Change company
+            - (@current_user_json_hash['memberships'] || []).reject { |c| @current_user_json_hash['company']['code'] == c['code'] }.each do |c|
+              = link_to(change_company_path(c['code']), method: :post, :class => 'dropdown-item') do
+                %span(display="block" clear="none" style="width: 32px; margin-right: 6px;")
+                  = image_tag "https://media.shoplift.fi/company_logos/#{c['logo_code']}_company_logo_24.png", style: "height: 16; width: 32px;"
+                = c['name']
           .dropdown-divider
-          - (@current_user_json_hash['memberships'] || []).reject { |c| @current_user_json_hash['company']['code'] == c['code'] }.each do |c|
-            = link_to(change_company_path(c['code']), method: :post, :class => 'dropdown-item') do
-              Switch company to: #{c['name']}
           = link_to(logout_path, method: :delete, :class => 'dropdown-item') do
             Logout
 .container-fluid

data/shopapp.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'shopapp'
-  s.version     = '0.2.11'
-  s.date        = '2018-10-01'
+  s.version     = '0.2.12'
+  s.date        = '2018-11-05'
   s.summary     = 'Do a shoplift.'
   s.description = 'Ha! Art thou Bedlam? Dost thou thirst base Trojan, to have me fold up Parca\'s fatal web? Hence!\
                    I am qualmish at the smell of leek.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopapp
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Zeljko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2018-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties