From 209c9242d96b914fe68252df03abb9cc8488753d Mon Sep 17 00:00:00 2001 From: Keir Osborn Date: Wed, 11 Jan 2017 02:39:58 +0000 Subject: [PATCH 1/7] remove word-wrap class from enterprise.email_address and enterprise.website in javascripts/templates/partials/contact.html.haml --- app/assets/javascripts/templates/partials/contact.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/templates/partials/contact.html.haml b/app/assets/javascripts/templates/partials/contact.html.haml index d173bcf3666..9779dd0f3e6 100644 --- a/app/assets/javascripts/templates/partials/contact.html.haml +++ b/app/assets/javascripts/templates/partials/contact.html.haml @@ -3,9 +3,9 @@ %p.modal-header {{'contact' | t}} %p{"ng-if" => "::enterprise.phone", "ng-bind" => "::enterprise.phone"} - %p.word-wrap{"ng-if" => "::enterprise.email_address"} + %p{"ng-if" => "::enterprise.email_address"} %a{"ng-href" => "{{::enterprise.email_address | stripUrl}}", target: "_blank", mailto: true} %span.email{"ng-bind" => "::enterprise.email_address | stripUrl"} - %p.word-wrap{"ng-if" => "enterprise.website"} + %p{"ng-if" => "enterprise.website"} %a{"ng-href" => "http://{{::enterprise.website | stripUrl}}", target: "_blank", "ng-bind" => "::enterprise.website | stripUrl"} From e8999d23e1e8006193203be500a7a1e863089fdd Mon Sep 17 00:00:00 2001 From: Lynne Davis Date: Fri, 9 Dec 2016 12:07:45 +0000 Subject: [PATCH 2/7] Updated translations --- ...dd_producer_properties_warning_and_table.html.haml.deface | 4 ++-- .../index/rename_form_headings.html.haml.deface | 5 +++++ config/locales/en.yml | 4 ++++ 3 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 app/overrides/spree/admin/product_properties/index/rename_form_headings.html.haml.deface diff --git a/app/overrides/spree/admin/product_properties/index/add_producer_properties_warning_and_table.html.haml.deface b/app/overrides/spree/admin/product_properties/index/add_producer_properties_warning_and_table.html.haml.deface index 8d2e598c438..c31a74b9e45 100644 --- a/app/overrides/spree/admin/product_properties/index/add_producer_properties_warning_and_table.html.haml.deface +++ b/app/overrides/spree/admin/product_properties/index/add_producer_properties_warning_and_table.html.haml.deface @@ -9,8 +9,8 @@ %table.index %thead %tr{"data-hook" => "producer_properties_header"} - %th= t(:inherited_property) - %th= t(:value) + %th= t('admin.products.properties.inherited_property') + %th= t('admin.description') %th.actions %tbody#producer_properties{"data-hook" => ""} - @product.supplier.producer_properties.each do |producer_property| diff --git a/app/overrides/spree/admin/product_properties/index/rename_form_headings.html.haml.deface b/app/overrides/spree/admin/product_properties/index/rename_form_headings.html.haml.deface new file mode 100644 index 00000000000..fd40c7bca14 --- /dev/null +++ b/app/overrides/spree/admin/product_properties/index/rename_form_headings.html.haml.deface @@ -0,0 +1,5 @@ +/ replace "tr[data-hook='product_properties_header']" +%tr{"data-hook" => "product_properties_header"} + %th{:colspan => "2"}= t('admin.products.properties.property_name') + %th= t('admin.description') + %th.actions \ No newline at end of file diff --git a/config/locales/en.yml b/config/locales/en.yml index 475942a692d..962b02e908f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -109,6 +109,7 @@ en: columns: Columns actions: Actions viewing: "Viewing: %{current_view_name}" + description: Description whats_this: What's this? @@ -225,6 +226,9 @@ en: av_on: "Av. On" variants: to_order_tip: "Items made to order do not have a set stock level, such as loaves of bread made fresh to order." + properties: + property_name: Property Name + inherited_property: Inherited Property variant_overrides: loading_flash: From 429ef4e2baee8ed408d73fbcf896bf248ce33354 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley Date: Mon, 21 Nov 2016 14:46:02 +0000 Subject: [PATCH 3/7] Altered product property headings for issue #522 --- .../index/rename_form_headings.html.haml.deface | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/overrides/spree/admin/product_properties/index/rename_form_headings.html.haml.deface b/app/overrides/spree/admin/product_properties/index/rename_form_headings.html.haml.deface index fd40c7bca14..fb3c7d0dcc4 100644 --- a/app/overrides/spree/admin/product_properties/index/rename_form_headings.html.haml.deface +++ b/app/overrides/spree/admin/product_properties/index/rename_form_headings.html.haml.deface @@ -2,4 +2,4 @@ %tr{"data-hook" => "product_properties_header"} %th{:colspan => "2"}= t('admin.products.properties.property_name') %th= t('admin.description') - %th.actions \ No newline at end of file + %th.actions From 0d5fde919b18337235dad190aeb61f455af8a5bd Mon Sep 17 00:00:00 2001 From: Lynne Davis Date: Fri, 24 Feb 2017 09:24:33 +0000 Subject: [PATCH 4/7] Property name spans signle col heading --- .../index/rename_form_headings.html.haml.deface | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/overrides/spree/admin/product_properties/index/rename_form_headings.html.haml.deface b/app/overrides/spree/admin/product_properties/index/rename_form_headings.html.haml.deface index fb3c7d0dcc4..011580c1bb6 100644 --- a/app/overrides/spree/admin/product_properties/index/rename_form_headings.html.haml.deface +++ b/app/overrides/spree/admin/product_properties/index/rename_form_headings.html.haml.deface @@ -1,5 +1,5 @@ / replace "tr[data-hook='product_properties_header']" %tr{"data-hook" => "product_properties_header"} - %th{:colspan => "2"}= t('admin.products.properties.property_name') + %th= t('admin.products.properties.property_name') %th= t('admin.description') %th.actions From a94961c0a71fdf3147f30df887b6457d958d67e9 Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Wed, 29 Mar 2017 14:58:19 +1100 Subject: [PATCH 5/7] Fixup merge conflicts and remove unused text --- app/views/admin/producer_properties/_form.html.haml | 4 ++-- config/locales/en.yml | 7 ++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/views/admin/producer_properties/_form.html.haml b/app/views/admin/producer_properties/_form.html.haml index 249301ae406..7af322557d3 100644 --- a/app/views/admin/producer_properties/_form.html.haml +++ b/app/views/admin/producer_properties/_form.html.haml @@ -4,8 +4,8 @@ %table.index.sortable{"data-hook" => "", "data-sortable-link" => main_app.update_positions_admin_enterprise_producer_properties_url(@enterprise)} %thead %tr{"data-hook" => "producer_properties_header"} - %th{colspan: "2"}= t('.property') - %th= t('.value') + %th{colspan: "2"}= t('admin.products.properties.property_name') + %th= t('admin.description') %th.actions %tbody#producer_properties{"data-hook" => ""} = f.fields_for :producer_properties do |pp_form| diff --git a/config/locales/en.yml b/config/locales/en.yml index 962b02e908f..63eff8f8f22 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -224,11 +224,11 @@ en: inherits_properties?: Inherits Properties? available_on: Available On av_on: "Av. On" - variants: - to_order_tip: "Items made to order do not have a set stock level, such as loaves of bread made fresh to order." properties: property_name: Property Name inherited_property: Inherited Property + variants: + to_order_tip: "Items made to order do not have a set stock level, such as loaves of bread made fresh to order." variant_overrides: loading_flash: @@ -507,9 +507,6 @@ en: advanced_settings: Advanced Settings update_and_close: Update and Close producer_properties: - form: - property: Property - value: Value index: title: Producer Properties shared: From e94ae20b3188029a7e5f10397032dbf8ca1d4d4a Mon Sep 17 00:00:00 2001 From: Pierre de Lacroix Date: Wed, 29 Mar 2017 12:21:41 +0200 Subject: [PATCH 6/7] fix print_ticket authorization --- app/models/spree/ability_decorator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/spree/ability_decorator.rb b/app/models/spree/ability_decorator.rb index e49db570cbf..3814365447f 100644 --- a/app/models/spree/ability_decorator.rb +++ b/app/models/spree/ability_decorator.rb @@ -175,7 +175,7 @@ def add_order_cycle_management_abilities(user) def add_order_management_abilities(user) # Enterprise User can only access orders that they are a distributor for can [:index, :create], Spree::Order - can [:read, :update, :fire, :resend, :invoice, :print], Spree::Order do |order| + can [:read, :update, :fire, :resend, :invoice, :print, :print_ticket], Spree::Order do |order| # We allow editing orders with a nil distributor as this state occurs # during the order creation process from the admin backend order.distributor.nil? || user.enterprises.include?(order.distributor) || order.order_cycle.andand.coordinated_by?(user) From 268bea25d0cab3a34651e41b2aac32e9504d231e Mon Sep 17 00:00:00 2001 From: Pierre de Lacroix Date: Thu, 30 Mar 2017 20:32:11 +0200 Subject: [PATCH 7/7] add qz/ folder from ofn-qz gem to list of assets --- config/application.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/config/application.rb b/config/application.rb index f9d6151e108..82191824cad 100644 --- a/config/application.rb +++ b/config/application.rb @@ -105,6 +105,7 @@ class Application < Rails::Application config.assets.precompile += ['mail/all.css'] config.assets.precompile += ['search/all.css', 'search/*.js'] config.assets.precompile += ['shared/*'] + config.assets.precompile += ['qz/*'] config.active_support.escape_html_entities_in_json = true end