From 40d9af28ea6d66b8a7c57b860d50c13a4086da09 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 19 Jan 2015 14:03:46 +0000 Subject: [PATCH 01/32] Added pt-PT translation --- config/locales/pt-PT.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 config/locales/pt-PT.yml diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml new file mode 100644 index 0000000..0b6ecac --- /dev/null +++ b/config/locales/pt-PT.yml @@ -0,0 +1,24 @@ +pt-PT: + spree: + account_no: N.º Conta + add_details: Adicionar detalhes + additional_details: Detalhes Adicionais + back_to_banks_list: Voltar à lista de Bancos + banks: Bancos + bank_name: Nome do Banco + confirm_details_submit: Tem a certeza que pretende submeter estes detalhes? Não será possível editar estes detalhes após envio. Confirme escolhendo "OK". + deactivate: Desactivar + deposited_on: Depositado em + how_bank_transfer_works: Como funciona a Transferência Bancária? + listing_banks: A listar Bancos + new_bank: Novo Banco + only_show_orders_with_bank_transfer_payment_reference_number: Mostrar apenas encomendas pagas por Transferência Bancária + payment_not_found: Pagamento não encontrado + payment_successfully_updated: Pagamento actualizado com sucesso + payment_reference_details: Detalhes de Pagamento por Transferência Bancária + transaction_reference_no: N.º da Transacção Bancária + activerecord: + models: + spree/bank: + one: Banco + other: Bancos From d267f93d00d1764ab0994133e55b2108bfdd3768 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 11 Feb 2015 15:48:21 +0000 Subject: [PATCH 02/32] new jquery-ui syntax "jquery-ui/datepicker" --- app/assets/javascripts/store/spree_bank_transfer.js.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/store/spree_bank_transfer.js.erb b/app/assets/javascripts/store/spree_bank_transfer.js.erb index 55acc06..a0dd0dc 100644 --- a/app/assets/javascripts/store/spree_bank_transfer.js.erb +++ b/app/assets/javascripts/store/spree_bank_transfer.js.erb @@ -1,4 +1,4 @@ -//= require jquery.ui.datepicker +//= require jquery-ui/datepicker $(document).ready(function() { $('#banktransfer_instructions').click(function(event) { newwindow = window.open($(this).attr('href'), 'bank transfer', 'left=20,top=20,width=650,height=750,toolbar=0,resizable=0,scrollbars=1'); @@ -27,4 +27,4 @@ $(document).ready(function() { return false; } }); -}); \ No newline at end of file +}); From 65ea5138f83d5074411e233c109353ff45cdf702 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 11 Feb 2015 23:19:13 +0000 Subject: [PATCH 03/32] spree and spree_auth_devise bump to ~> 2.4 --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index c850d3a..a7bae2f 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source 'https://rubygems.org' # Provides basic authentication functionality for testing parts of your engine -gem 'spree', '~> 2.3.0' -gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-3-stable' +gem 'spree', '~> 2.4.0' +gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-4-stable' gem 'mysql2' group :assets do From b8553bcfbf53066782f100806a081cc99aec3608 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 16 Feb 2015 16:20:46 +0000 Subject: [PATCH 04/32] Adjust to spree 3-0-stable --- spree_bank_transfer.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spree_bank_transfer.gemspec b/spree_bank_transfer.gemspec index 00593c6..13a3b92 100644 --- a/spree_bank_transfer.gemspec +++ b/spree_bank_transfer.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = 'spree-bank-transfer' - s.version = '2.3.0' + s.version = '3.0.0' s.summary = 'Spree extension to create bank transfer payment method.' s.description = 'This Spree extension allows admin to provide bank transfer payment method to its users.' s.required_ruby_version = '>= 1.9.3' @@ -16,6 +16,6 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.requirements << 'none' - s.add_dependency 'spree_core', '~> 2.3.0' + s.add_dependency 'spree_core', '~> 3.0.0.rc1' end From 8fd865828762086d9c99e4514a6d24075167447b Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 16 Feb 2015 16:21:48 +0000 Subject: [PATCH 05/32] Adjust to spree 3-0-stable --- Versionfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Versionfile b/Versionfile index 5db83aa..b6a0e53 100644 --- a/Versionfile +++ b/Versionfile @@ -8,4 +8,5 @@ # '1.0.x' => { :branch => '1-0-stable' } # '0.70.x' => { :branch => '0-70-stable' } # '0.40.x' => { :tag => 'v1.0.0', :version => '1.0.0' } - +'2.4.x' => { :branch => '2-4-stable' } +'3.0.x' => { :branch => '3-0-stable' } From 5b30a329981e4bebe7e5c42e14fbb11a0fa20bd1 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 16 Feb 2015 16:22:46 +0000 Subject: [PATCH 06/32] Adjust to spree 3-0-stable --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index a7bae2f..4c789de 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,8 @@ source 'https://rubygems.org' # Provides basic authentication functionality for testing parts of your engine -gem 'spree', '~> 2.4.0' -gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-4-stable' +gem 'spree', '~> 3.0.0.rc1' +gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '3-0-stable' gem 'mysql2' group :assets do From c5f0c89976f946edfaf33a53ee93527685c4dccd Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 16 Feb 2015 16:54:34 +0000 Subject: [PATCH 07/32] Adjust to spree 3-0-stable --- spree_bank_transfer.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spree_bank_transfer.gemspec b/spree_bank_transfer.gemspec index 13a3b92..cd17b40 100644 --- a/spree_bank_transfer.gemspec +++ b/spree_bank_transfer.gemspec @@ -16,6 +16,6 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.requirements << 'none' - s.add_dependency 'spree_core', '~> 3.0.0.rc1' + s.add_dependency 'spree_core', '~> 3.0.0.rc2' end From 9d9af44cee88474b1c3d3cb4f8d6c7739c477a30 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 16 Feb 2015 16:55:45 +0000 Subject: [PATCH 08/32] Adjust to spree 3-0-stable --- Versionfile | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/Versionfile b/Versionfile index b6a0e53..dbf9af9 100644 --- a/Versionfile +++ b/Versionfile @@ -1,12 +1,6 @@ -# This file is used to designate compatibilty with different versions of Spree -# Please see http://spreecommerce.com/documentation/extensions.html#versionfile for details - -# Examples -# -# '1.2.x' => { :branch => 'master' } -# '1.1.x' => { :branch => '1-1-stable' } -# '1.0.x' => { :branch => '1-0-stable' } -# '0.70.x' => { :branch => '0-70-stable' } -# '0.40.x' => { :tag => 'v1.0.0', :version => '1.0.0' } -'2.4.x' => { :branch => '2-4-stable' } '3.0.x' => { :branch => '3-0-stable' } +'2.4.x' => { :branch => '2-4-stable' } +'2.3.x' => { :branch => '2-3-stable' } +'2.2.x' => { :branch => '2-2-stable' } +'2.1.x' => { :branch => '2-1-stable' } +'2.0.x' => { :branch => '2-0-stable' } From fd24e4890de44c86bcff4be2c6f703ccaaf0fcba Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 16 Feb 2015 16:56:46 +0000 Subject: [PATCH 09/32] Adjust to spree 3-0-stable --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 4c789de..035a041 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ source 'https://rubygems.org' # Provides basic authentication functionality for testing parts of your engine -gem 'spree', '~> 3.0.0.rc1' +gem 'spree', github: 'spree/spree', branch: '3-0-stable' gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '3-0-stable' gem 'mysql2' From 13f2fb522c0f90ba6927c643467940be8b707323 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 16 Feb 2015 16:57:55 +0000 Subject: [PATCH 10/32] i18n locale for Portugal is 'pt' and not 'pt-PT' --- config/locales/{pt-PT.yml => pt.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename config/locales/{pt-PT.yml => pt.yml} (100%) diff --git a/config/locales/pt-PT.yml b/config/locales/pt.yml similarity index 100% rename from config/locales/pt-PT.yml rename to config/locales/pt.yml From 361cc811a77588c4af5eca511c72bd547b0aa42b Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 16 Feb 2015 16:58:11 +0000 Subject: [PATCH 11/32] i18n locale for Portugal is 'pt' and not 'pt-PT' --- config/locales/pt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 0b6ecac..1eb3990 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -1,4 +1,4 @@ -pt-PT: +pt: spree: account_no: N.º Conta add_details: Adicionar detalhes From d05779ed5d4350d4823518e715c46f8937e2eb96 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 18 Feb 2015 11:09:05 +0000 Subject: [PATCH 12/32] Adjust to spree 3-0-stable --- Gemfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 035a041..cc79b7c 100644 --- a/Gemfile +++ b/Gemfile @@ -1,8 +1,9 @@ source 'https://rubygems.org' # Provides basic authentication functionality for testing parts of your engine -gem 'spree', github: 'spree/spree', branch: '3-0-stable' -gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '3-0-stable' +version = '3-0-stable' +gem 'spree', github: 'spree/spree', version +gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: version gem 'mysql2' group :assets do From b779fb640776f3ee500e741be622d0b65833f8aa Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Wed, 18 Feb 2015 11:12:13 +0000 Subject: [PATCH 13/32] replace '-' with '_' in 'spree-bank-transfer' --- spree_bank_transfer.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spree_bank_transfer.gemspec b/spree_bank_transfer.gemspec index cd17b40..b57de98 100644 --- a/spree_bank_transfer.gemspec +++ b/spree_bank_transfer.gemspec @@ -1,7 +1,7 @@ # encoding: UTF-8 Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY - s.name = 'spree-bank-transfer' + s.name = 'spree_bank_transfer' s.version = '3.0.0' s.summary = 'Spree extension to create bank transfer payment method.' s.description = 'This Spree extension allows admin to provide bank transfer payment method to its users.' From 81bd380c27bbdfbc447c318c5e5633cce3d926ad Mon Sep 17 00:00:00 2001 From: redglory Date: Fri, 26 Jun 2015 00:56:32 +0100 Subject: [PATCH 14/32] changed assets directory references --- .../{admin => spree/backend}/spree_bank_transfer.js | 0 .../{store => spree/frontend}/spree_bank_transfer.js.erb | 0 .../{admin => spree/backend}/spree_bank_transfer.css | 0 .../{store => spree/frontend}/spree_bank_transfer.css | 0 .../spree_bank_transfer/install/install_generator.rb | 8 ++++---- 5 files changed, 4 insertions(+), 4 deletions(-) rename app/assets/javascripts/{admin => spree/backend}/spree_bank_transfer.js (100%) rename app/assets/javascripts/{store => spree/frontend}/spree_bank_transfer.js.erb (100%) rename app/assets/stylesheets/{admin => spree/backend}/spree_bank_transfer.css (100%) rename app/assets/stylesheets/{store => spree/frontend}/spree_bank_transfer.css (100%) diff --git a/app/assets/javascripts/admin/spree_bank_transfer.js b/app/assets/javascripts/spree/backend/spree_bank_transfer.js similarity index 100% rename from app/assets/javascripts/admin/spree_bank_transfer.js rename to app/assets/javascripts/spree/backend/spree_bank_transfer.js diff --git a/app/assets/javascripts/store/spree_bank_transfer.js.erb b/app/assets/javascripts/spree/frontend/spree_bank_transfer.js.erb similarity index 100% rename from app/assets/javascripts/store/spree_bank_transfer.js.erb rename to app/assets/javascripts/spree/frontend/spree_bank_transfer.js.erb diff --git a/app/assets/stylesheets/admin/spree_bank_transfer.css b/app/assets/stylesheets/spree/backend/spree_bank_transfer.css similarity index 100% rename from app/assets/stylesheets/admin/spree_bank_transfer.css rename to app/assets/stylesheets/spree/backend/spree_bank_transfer.css diff --git a/app/assets/stylesheets/store/spree_bank_transfer.css b/app/assets/stylesheets/spree/frontend/spree_bank_transfer.css similarity index 100% rename from app/assets/stylesheets/store/spree_bank_transfer.css rename to app/assets/stylesheets/spree/frontend/spree_bank_transfer.css diff --git a/lib/generators/spree_bank_transfer/install/install_generator.rb b/lib/generators/spree_bank_transfer/install/install_generator.rb index 4ecb700..0626331 100644 --- a/lib/generators/spree_bank_transfer/install/install_generator.rb +++ b/lib/generators/spree_bank_transfer/install/install_generator.rb @@ -5,13 +5,13 @@ class InstallGenerator < Rails::Generators::Base class_option :auto_run_migrations, :type => :boolean, :default => false def add_javascripts - append_file 'vendor/assets/javascripts/spree/frontend/all.js', "\n//= require store/spree_bank_transfer\n" - append_file 'vendor/assets/javascripts/spree/backend/all.js', "\n//= require admin/spree_bank_transfer\n" + append_file 'vendor/assets/javascripts/spree/frontend/all.js', "\n//= require spree/frontend/spree_bank_transfer\n" + append_file 'vendor/assets/javascripts/spree/backend/all.js', "\n//= require spree/backend/spree_bank_transfer\n" end def add_stylesheets - inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require store/spree_bank_transfer\n", :before => /\*\//, :verbose => true - inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require admin/spree_bank_transfer\n", :before => /\*\//, :verbose => true + inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/spree_bank_transfer\n", :before => /\*\//, :verbose => true + inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/spree_bank_transfer\n", :before => /\*\//, :verbose => true end def add_migrations From 0d5011aa96db8c0ed6ee36ce181d772841a23f63 Mon Sep 17 00:00:00 2001 From: redglory Date: Thu, 9 Jul 2015 06:36:34 -0400 Subject: [PATCH 15/32] fix sidebar configuration menu --- app/overrides/add_banks_to_admin_configuration_sidebar.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/overrides/add_banks_to_admin_configuration_sidebar.rb b/app/overrides/add_banks_to_admin_configuration_sidebar.rb index f699c2c..3dd198c 100644 --- a/app/overrides/add_banks_to_admin_configuration_sidebar.rb +++ b/app/overrides/add_banks_to_admin_configuration_sidebar.rb @@ -1,8 +1,8 @@ Deface::Override.new( - :virtual_path => 'spree/admin/shared/_configuration_menu', + :virtual_path => 'spree/admin/shared/sub_menu/_configuration', :name => 'add_banks_to_admin_configuration_sidebar', :insert_bottom => "[data-hook='admin_configurations_sidebar_menu']", :text => %q{ - <%= configurations_sidebar_menu_item Spree.t(:banks), admin_banks_path %> + <%= configurations_sidebar_menu_item(Spree.t(:banks), admin_banks_path) %> } ) \ No newline at end of file From 60399498e0483d7efb84266bcf3e1f9aece27e81 Mon Sep 17 00:00:00 2001 From: redglory Date: Fri, 10 Jul 2015 07:31:08 -0400 Subject: [PATCH 16/32] Adjust to new backend bootstrap theme and fix toggle_navitagion.js.erb --- app/helpers/spree/admin/banks_helper.rb | 4 ++ .../admin/navigation_helper_decorator.rb | 21 ++++++ app/views/spree/admin/banks/_form.html.erb | 45 ++++++------ app/views/spree/admin/banks/edit.html.erb | 16 ++++- app/views/spree/admin/banks/index.html.erb | 69 +++++++++++-------- app/views/spree/admin/banks/new.html.erb | 15 ++-- .../admin/banks/toggle_activation.js.erb | 6 +- 7 files changed, 115 insertions(+), 61 deletions(-) create mode 100644 app/helpers/spree/admin/navigation_helper_decorator.rb diff --git a/app/helpers/spree/admin/banks_helper.rb b/app/helpers/spree/admin/banks_helper.rb index 0905e56..10503cc 100644 --- a/app/helpers/spree/admin/banks_helper.rb +++ b/app/helpers/spree/admin/banks_helper.rb @@ -10,6 +10,10 @@ def action_to_toggle_bank_status(bank) bank.active? ? Spree.t(:deactivate) : Spree.t(:activate) end + def action_text_to_toggle_bank_status(bank) + bank.active? ? 'remove-sign' : 'ok-sign' + end + end end end \ No newline at end of file diff --git a/app/helpers/spree/admin/navigation_helper_decorator.rb b/app/helpers/spree/admin/navigation_helper_decorator.rb new file mode 100644 index 0000000..f15b486 --- /dev/null +++ b/app/helpers/spree/admin/navigation_helper_decorator.rb @@ -0,0 +1,21 @@ +module Spree + module Admin + module NavigationHelper + + def link_to_with_icon(icon_name, text, url, options = {}) + options[:class] = (options[:class].to_s + " icon-link with-tip action-#{icon_name}").strip + options[:class] += ' no-text' if options[:no_text] + options[:title] = text if options[:no_text] + text = options[:no_text] ? '' : raw("#{text}") + text = text.gsub('\'', '"') + options.delete(:no_text) + if icon_name + icon = content_tag(:span, '', class: "icon icon-#{icon_name}") + text.insert(0, icon + ' ') + end + link_to(text.html_safe, url, options) + end + + end + end +end \ No newline at end of file diff --git a/app/views/spree/admin/banks/_form.html.erb b/app/views/spree/admin/banks/_form.html.erb index 9db5e86..e8f417a 100644 --- a/app/views/spree/admin/banks/_form.html.erb +++ b/app/views/spree/admin/banks/_form.html.erb @@ -1,31 +1,26 @@ -<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @bank } %> +
+
+ <%= f.field_container :name, :class => ['form-group'] do %> + <%= f.label :name, Spree.t(:name) %> *
+ <%= f.error_message_on :name, :class => 'fullwidth title' %> + <%= f.text_field :name, :class => 'form-control' %> + <% end %> -<%= form_for [:admin, @bank] do |f| %> -
-
- <%= f.field_container :name do %> - <%= f.label :name, Spree.t(:name) %> *
- <%= f.error_message_on :name, :class => 'fullwidth title' %> - <%= f.text_field :name, :class => 'fullwidth' %> - <% end %> - - <%= f.field_container :account_no do %> - <%= f.label :account_no, Spree.t(:account_no) %>*
- <%= f.text_field :account_no, :class => 'fullwidth' %> - <% end %> + <%= f.field_container :account_no, :class => ['form-group'] do %> + <%= f.label :account_no, Spree.t(:account_no) %>*
+ <%= f.text_field :account_no, :class => 'form-control' %> + <% end %> - <%= f.field_container :additional_details do %> - <%= f.label :additional_details, Spree.t(:additional_details) %>
- <%= f.text_area :additional_details, :rows => 10, :class => 'fullwidth' %> - <% end %> + <%= f.field_container :additional_details, :class => ['form-group'] do %> + <%= f.label :additional_details, Spree.t(:additional_details) %>
+ <%= f.text_area :additional_details, :rows => 10, :class => 'form-control' %> + <% end %> - <%= f.field_container :active do %> + <%= f.field_container :active, :class => ['checkbox'] do %> + <%= f.label :active do %> <%= f.check_box :active %> - <%= f.label :active, Spree.t(:active) %> + <%= Spree.t(:active) %> <% end %> - - <%= f.submit %> - -
+ <% end %>
-<% end %> \ No newline at end of file +
\ No newline at end of file diff --git a/app/views/spree/admin/banks/edit.html.erb b/app/views/spree/admin/banks/edit.html.erb index f3066c5..73e9ccc 100644 --- a/app/views/spree/admin/banks/edit.html.erb +++ b/app/views/spree/admin/banks/edit.html.erb @@ -1,2 +1,14 @@ -

<%= Spree.t(:edit_bank) %>

-<%= render :partial => 'form' %> \ No newline at end of file +<% content_for :page_title do %> + <%= Spree.t(:editing_resource, resource: Spree::Bank.model_name.human) %> / <%= @bank.name %> +<% end %> + +<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @bank } %> + +<%= form_for @bank, :url => admin_bank_path(@bank) do |f| %> +
+ <%= render :partial => 'form', :locals => { :f => f } %> +
+ <%= button Spree.t('actions.update'), 'save' %> +
+
+<% end %> \ No newline at end of file diff --git a/app/views/spree/admin/banks/index.html.erb b/app/views/spree/admin/banks/index.html.erb index eaacfa6..c6251ea 100644 --- a/app/views/spree/admin/banks/index.html.erb +++ b/app/views/spree/admin/banks/index.html.erb @@ -1,37 +1,50 @@ -<%= render :partial => 'spree/admin/shared/configuration_menu' %> +<%= render :partial => 'spree/admin/shared/sub_menu/configuration' %> <% content_for :page_title do %> - <%= Spree.t(:listing_banks) %> + <%= plural_resource_name(Spree::Bank) %> <% end %> <% content_for :page_actions do %> -
  • - <%= button_link_to Spree.t(:new_bank), new_admin_bank_path %> -
    • + <%= button_link_to Spree.t(:new_bank), new_object_url, :class => "btn-success", :icon => 'add', :id => 'admin_new_bank_link' %> <% end %> -<%= paginate @banks %> +<% if @banks.any? %> - - - - - - - - - - - - <% @banks.each do |bank| %> - - - - - - - +
    <%= Spree.t(:bank_name) %><%= Spree.t(:account_no) %><%= Spree.t(:additional_details) %><%= Spree.t(:status) %>
    <%= bank.name %><%= bank.account_no %><%= bank.additional_details %><%= bank_status(bank) %><%= link_to action_to_toggle_bank_status(bank), toggle_activation_admin_bank_path(bank), :remote => true, :method => :put %><%= link_to_edit bank, :no_text => true, :class => 'edit' %>
    + + + + + + - <% end %> - -
    <%= Spree.t(:bank_name) %><%= Spree.t(:account_no) %><%= Spree.t(:additional_details) %><%= Spree.t(:status) %>
    \ No newline at end of file + + + <% @banks.each do |bank|%> + + <%= bank.name %> + <%= bank.account_no %> + <%= bank.additional_details %> + <%= bank_status(bank) %> + + <% action_class = bank.active ? "btn-danger" : "btn-success" %> + <% btn_class = 'btn ' + action_class + ' btn-sm' %> + <% status = bank.active ? "active" : "inactive" %> + <% bank_id = 'bank-' + bank[:id].to_s %> + <%= link_to_with_icon(action_text_to_toggle_bank_status(bank), action_to_toggle_bank_status(bank), toggle_activation_admin_bank_path(bank), {:class => btn_class, :id => bank_id, :rel => status, :remote => true, :method => :put}) %> + + + <%= link_to_edit(bank, :no_text => true) if can? :edit, bank %> + <%= link_to_delete(bank, :no_text => true) if can? :delete, bank %> + + + <% end %> + + + +<% else %> +
    + <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Bank)) %>, + <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::Bank %>! +
    +<% end %> \ No newline at end of file diff --git a/app/views/spree/admin/banks/new.html.erb b/app/views/spree/admin/banks/new.html.erb index b931d40..501d2f3 100644 --- a/app/views/spree/admin/banks/new.html.erb +++ b/app/views/spree/admin/banks/new.html.erb @@ -1,13 +1,18 @@ -<%= render :partial => 'spree/admin/shared/configuration_menu' %> +<%= render :partial => 'spree/admin/shared/sub_menu/configuration' %> <% content_for :page_title do %> <%= Spree.t(:new_bank) %> <% end %> <% content_for :page_actions do %> -
  • - <%= button_link_to Spree.t(:back_to_banks_list), admin_banks_path, :icon => 'icon-arrow-left' %> -
    • + <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_banks_list), admin_banks_path, :class => 'btn btn-primary' %> <% end %> -<%= render :partial => 'form' %> +<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @bank } %> + +<%= form_for [:admin, @bank] do |f| %> +
    + <%= render :partial => 'form', :locals => { :f => f } %> + <%= render :partial => 'spree/admin/shared/new_resource_links' %> +
    +<% end %> \ No newline at end of file diff --git a/app/views/spree/admin/banks/toggle_activation.js.erb b/app/views/spree/admin/banks/toggle_activation.js.erb index f0c08fb..92e88ea 100644 --- a/app/views/spree/admin/banks/toggle_activation.js.erb +++ b/app/views/spree/admin/banks/toggle_activation.js.erb @@ -1,6 +1,10 @@ <% if @success %> $('#active-status-<%= @bank.id %>').text('<%= bank_status(@bank) %>') - $('a[href="<%= toggle_activation_admin_bank_path(@bank) %>"]').text('<%= action_to_toggle_bank_status(@bank) %>') + <% action_class = @bank.active ? "btn-danger" : "btn-success" %> + <% btn_class = "btn " + action_class + " btn-sm" %> + <% status = @bank.active ? "active" : "inactive" %> + <% bank_id = "bank-" + @bank[:id].to_s %> + $('#toggle-status-<%= @bank.id %>').html('<%= link_to_with_icon(action_text_to_toggle_bank_status(@bank), action_to_toggle_bank_status(@bank), toggle_activation_admin_bank_path(@bank), {:class => btn_class, :id => bank_id, :rel => status, :remote => true, :method => :put}) %>') <% else %> alert('<%= @bank.errors.full_messages.to_sentence %>') <% end %> \ No newline at end of file From 340285eabb9068e389dc5692373342dfd6525327 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 16 Feb 2015 16:57:55 +0000 Subject: [PATCH 17/32] i18n locale for Portugal is 'pt' and not 'pt-PT' --- config/locales/{pt-PT.yml => pt.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename config/locales/{pt-PT.yml => pt.yml} (100%) diff --git a/config/locales/pt-PT.yml b/config/locales/pt.yml similarity index 100% rename from config/locales/pt-PT.yml rename to config/locales/pt.yml From e45ff02be0b4cbb8597902346bd8aecc244cae94 Mon Sep 17 00:00:00 2001 From: Pedro Pinto Date: Mon, 16 Feb 2015 16:58:11 +0000 Subject: [PATCH 18/32] i18n locale for Portugal is 'pt' and not 'pt-PT' --- config/locales/pt.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 0b6ecac..1eb3990 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -1,4 +1,4 @@ -pt-PT: +pt: spree: account_no: N.º Conta add_details: Adicionar detalhes From 48b4a64fca6649b60680cea40d193579d7d53f2b Mon Sep 17 00:00:00 2001 From: redglory Date: Fri, 26 Jun 2015 00:56:32 +0100 Subject: [PATCH 19/32] changed assets directory references --- .../{admin => spree/backend}/spree_bank_transfer.js | 0 .../{store => spree/frontend}/spree_bank_transfer.js.erb | 0 .../{admin => spree/backend}/spree_bank_transfer.css | 0 .../{store => spree/frontend}/spree_bank_transfer.css | 0 .../spree_bank_transfer/install/install_generator.rb | 8 ++++---- 5 files changed, 4 insertions(+), 4 deletions(-) rename app/assets/javascripts/{admin => spree/backend}/spree_bank_transfer.js (100%) rename app/assets/javascripts/{store => spree/frontend}/spree_bank_transfer.js.erb (100%) rename app/assets/stylesheets/{admin => spree/backend}/spree_bank_transfer.css (100%) rename app/assets/stylesheets/{store => spree/frontend}/spree_bank_transfer.css (100%) diff --git a/app/assets/javascripts/admin/spree_bank_transfer.js b/app/assets/javascripts/spree/backend/spree_bank_transfer.js similarity index 100% rename from app/assets/javascripts/admin/spree_bank_transfer.js rename to app/assets/javascripts/spree/backend/spree_bank_transfer.js diff --git a/app/assets/javascripts/store/spree_bank_transfer.js.erb b/app/assets/javascripts/spree/frontend/spree_bank_transfer.js.erb similarity index 100% rename from app/assets/javascripts/store/spree_bank_transfer.js.erb rename to app/assets/javascripts/spree/frontend/spree_bank_transfer.js.erb diff --git a/app/assets/stylesheets/admin/spree_bank_transfer.css b/app/assets/stylesheets/spree/backend/spree_bank_transfer.css similarity index 100% rename from app/assets/stylesheets/admin/spree_bank_transfer.css rename to app/assets/stylesheets/spree/backend/spree_bank_transfer.css diff --git a/app/assets/stylesheets/store/spree_bank_transfer.css b/app/assets/stylesheets/spree/frontend/spree_bank_transfer.css similarity index 100% rename from app/assets/stylesheets/store/spree_bank_transfer.css rename to app/assets/stylesheets/spree/frontend/spree_bank_transfer.css diff --git a/lib/generators/spree_bank_transfer/install/install_generator.rb b/lib/generators/spree_bank_transfer/install/install_generator.rb index 4ecb700..0626331 100644 --- a/lib/generators/spree_bank_transfer/install/install_generator.rb +++ b/lib/generators/spree_bank_transfer/install/install_generator.rb @@ -5,13 +5,13 @@ class InstallGenerator < Rails::Generators::Base class_option :auto_run_migrations, :type => :boolean, :default => false def add_javascripts - append_file 'vendor/assets/javascripts/spree/frontend/all.js', "\n//= require store/spree_bank_transfer\n" - append_file 'vendor/assets/javascripts/spree/backend/all.js', "\n//= require admin/spree_bank_transfer\n" + append_file 'vendor/assets/javascripts/spree/frontend/all.js', "\n//= require spree/frontend/spree_bank_transfer\n" + append_file 'vendor/assets/javascripts/spree/backend/all.js', "\n//= require spree/backend/spree_bank_transfer\n" end def add_stylesheets - inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require store/spree_bank_transfer\n", :before => /\*\//, :verbose => true - inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require admin/spree_bank_transfer\n", :before => /\*\//, :verbose => true + inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/spree_bank_transfer\n", :before => /\*\//, :verbose => true + inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/spree_bank_transfer\n", :before => /\*\//, :verbose => true end def add_migrations From 949db2e6df103fa383f0e118f1be5f6ece21fe7e Mon Sep 17 00:00:00 2001 From: redglory Date: Thu, 9 Jul 2015 06:36:34 -0400 Subject: [PATCH 20/32] fix sidebar configuration menu --- app/overrides/add_banks_to_admin_configuration_sidebar.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/overrides/add_banks_to_admin_configuration_sidebar.rb b/app/overrides/add_banks_to_admin_configuration_sidebar.rb index f699c2c..3dd198c 100644 --- a/app/overrides/add_banks_to_admin_configuration_sidebar.rb +++ b/app/overrides/add_banks_to_admin_configuration_sidebar.rb @@ -1,8 +1,8 @@ Deface::Override.new( - :virtual_path => 'spree/admin/shared/_configuration_menu', + :virtual_path => 'spree/admin/shared/sub_menu/_configuration', :name => 'add_banks_to_admin_configuration_sidebar', :insert_bottom => "[data-hook='admin_configurations_sidebar_menu']", :text => %q{ - <%= configurations_sidebar_menu_item Spree.t(:banks), admin_banks_path %> + <%= configurations_sidebar_menu_item(Spree.t(:banks), admin_banks_path) %> } ) \ No newline at end of file From 728733418c401a73cbefeb609cc674c6d0e930ff Mon Sep 17 00:00:00 2001 From: redglory Date: Fri, 10 Jul 2015 07:31:08 -0400 Subject: [PATCH 21/32] Adjust to new backend bootstrap theme and fix toggle_navitagion.js.erb --- app/helpers/spree/admin/banks_helper.rb | 4 ++ .../admin/navigation_helper_decorator.rb | 21 ++++++ app/views/spree/admin/banks/_form.html.erb | 45 ++++++------ app/views/spree/admin/banks/edit.html.erb | 16 ++++- app/views/spree/admin/banks/index.html.erb | 69 +++++++++++-------- app/views/spree/admin/banks/new.html.erb | 15 ++-- .../admin/banks/toggle_activation.js.erb | 6 +- 7 files changed, 115 insertions(+), 61 deletions(-) create mode 100644 app/helpers/spree/admin/navigation_helper_decorator.rb diff --git a/app/helpers/spree/admin/banks_helper.rb b/app/helpers/spree/admin/banks_helper.rb index 0905e56..10503cc 100644 --- a/app/helpers/spree/admin/banks_helper.rb +++ b/app/helpers/spree/admin/banks_helper.rb @@ -10,6 +10,10 @@ def action_to_toggle_bank_status(bank) bank.active? ? Spree.t(:deactivate) : Spree.t(:activate) end + def action_text_to_toggle_bank_status(bank) + bank.active? ? 'remove-sign' : 'ok-sign' + end + end end end \ No newline at end of file diff --git a/app/helpers/spree/admin/navigation_helper_decorator.rb b/app/helpers/spree/admin/navigation_helper_decorator.rb new file mode 100644 index 0000000..f15b486 --- /dev/null +++ b/app/helpers/spree/admin/navigation_helper_decorator.rb @@ -0,0 +1,21 @@ +module Spree + module Admin + module NavigationHelper + + def link_to_with_icon(icon_name, text, url, options = {}) + options[:class] = (options[:class].to_s + " icon-link with-tip action-#{icon_name}").strip + options[:class] += ' no-text' if options[:no_text] + options[:title] = text if options[:no_text] + text = options[:no_text] ? '' : raw("#{text}") + text = text.gsub('\'', '"') + options.delete(:no_text) + if icon_name + icon = content_tag(:span, '', class: "icon icon-#{icon_name}") + text.insert(0, icon + ' ') + end + link_to(text.html_safe, url, options) + end + + end + end +end \ No newline at end of file diff --git a/app/views/spree/admin/banks/_form.html.erb b/app/views/spree/admin/banks/_form.html.erb index 9db5e86..e8f417a 100644 --- a/app/views/spree/admin/banks/_form.html.erb +++ b/app/views/spree/admin/banks/_form.html.erb @@ -1,31 +1,26 @@ -<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @bank } %> +
    +
    + <%= f.field_container :name, :class => ['form-group'] do %> + <%= f.label :name, Spree.t(:name) %> *
    + <%= f.error_message_on :name, :class => 'fullwidth title' %> + <%= f.text_field :name, :class => 'form-control' %> + <% end %> -<%= form_for [:admin, @bank] do |f| %> -
    -
    - <%= f.field_container :name do %> - <%= f.label :name, Spree.t(:name) %> *
    - <%= f.error_message_on :name, :class => 'fullwidth title' %> - <%= f.text_field :name, :class => 'fullwidth' %> - <% end %> - - <%= f.field_container :account_no do %> - <%= f.label :account_no, Spree.t(:account_no) %>*
    - <%= f.text_field :account_no, :class => 'fullwidth' %> - <% end %> + <%= f.field_container :account_no, :class => ['form-group'] do %> + <%= f.label :account_no, Spree.t(:account_no) %>*
    + <%= f.text_field :account_no, :class => 'form-control' %> + <% end %> - <%= f.field_container :additional_details do %> - <%= f.label :additional_details, Spree.t(:additional_details) %>
    - <%= f.text_area :additional_details, :rows => 10, :class => 'fullwidth' %> - <% end %> + <%= f.field_container :additional_details, :class => ['form-group'] do %> + <%= f.label :additional_details, Spree.t(:additional_details) %>
    + <%= f.text_area :additional_details, :rows => 10, :class => 'form-control' %> + <% end %> - <%= f.field_container :active do %> + <%= f.field_container :active, :class => ['checkbox'] do %> + <%= f.label :active do %> <%= f.check_box :active %> - <%= f.label :active, Spree.t(:active) %> + <%= Spree.t(:active) %> <% end %> - - <%= f.submit %> - -
    + <% end %>
    -<% end %> \ No newline at end of file +
    \ No newline at end of file diff --git a/app/views/spree/admin/banks/edit.html.erb b/app/views/spree/admin/banks/edit.html.erb index f3066c5..73e9ccc 100644 --- a/app/views/spree/admin/banks/edit.html.erb +++ b/app/views/spree/admin/banks/edit.html.erb @@ -1,2 +1,14 @@ -

    <%= Spree.t(:edit_bank) %>

    -<%= render :partial => 'form' %> \ No newline at end of file +<% content_for :page_title do %> + <%= Spree.t(:editing_resource, resource: Spree::Bank.model_name.human) %> / <%= @bank.name %> +<% end %> + +<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @bank } %> + +<%= form_for @bank, :url => admin_bank_path(@bank) do |f| %> +
    + <%= render :partial => 'form', :locals => { :f => f } %> +
    + <%= button Spree.t('actions.update'), 'save' %> +
    +
    +<% end %> \ No newline at end of file diff --git a/app/views/spree/admin/banks/index.html.erb b/app/views/spree/admin/banks/index.html.erb index eaacfa6..c6251ea 100644 --- a/app/views/spree/admin/banks/index.html.erb +++ b/app/views/spree/admin/banks/index.html.erb @@ -1,37 +1,50 @@ -<%= render :partial => 'spree/admin/shared/configuration_menu' %> +<%= render :partial => 'spree/admin/shared/sub_menu/configuration' %> <% content_for :page_title do %> - <%= Spree.t(:listing_banks) %> + <%= plural_resource_name(Spree::Bank) %> <% end %> <% content_for :page_actions do %> -
  • - <%= button_link_to Spree.t(:new_bank), new_admin_bank_path %> -
    • + <%= button_link_to Spree.t(:new_bank), new_object_url, :class => "btn-success", :icon => 'add', :id => 'admin_new_bank_link' %> <% end %> -<%= paginate @banks %> +<% if @banks.any? %> - - - - - - - - - - - - <% @banks.each do |bank| %> - - - - - - - +
    <%= Spree.t(:bank_name) %><%= Spree.t(:account_no) %><%= Spree.t(:additional_details) %><%= Spree.t(:status) %>
    <%= bank.name %><%= bank.account_no %><%= bank.additional_details %><%= bank_status(bank) %><%= link_to action_to_toggle_bank_status(bank), toggle_activation_admin_bank_path(bank), :remote => true, :method => :put %><%= link_to_edit bank, :no_text => true, :class => 'edit' %>
    + + + + + + - <% end %> - -
    <%= Spree.t(:bank_name) %><%= Spree.t(:account_no) %><%= Spree.t(:additional_details) %><%= Spree.t(:status) %>
    \ No newline at end of file + + + <% @banks.each do |bank|%> + + <%= bank.name %> + <%= bank.account_no %> + <%= bank.additional_details %> + <%= bank_status(bank) %> + + <% action_class = bank.active ? "btn-danger" : "btn-success" %> + <% btn_class = 'btn ' + action_class + ' btn-sm' %> + <% status = bank.active ? "active" : "inactive" %> + <% bank_id = 'bank-' + bank[:id].to_s %> + <%= link_to_with_icon(action_text_to_toggle_bank_status(bank), action_to_toggle_bank_status(bank), toggle_activation_admin_bank_path(bank), {:class => btn_class, :id => bank_id, :rel => status, :remote => true, :method => :put}) %> + + + <%= link_to_edit(bank, :no_text => true) if can? :edit, bank %> + <%= link_to_delete(bank, :no_text => true) if can? :delete, bank %> + + + <% end %> + + + +<% else %> +
    + <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Bank)) %>, + <%= link_to(Spree.t(:add_one), new_object_url) if can? :create, Spree::Bank %>! +
    +<% end %> \ No newline at end of file diff --git a/app/views/spree/admin/banks/new.html.erb b/app/views/spree/admin/banks/new.html.erb index b931d40..501d2f3 100644 --- a/app/views/spree/admin/banks/new.html.erb +++ b/app/views/spree/admin/banks/new.html.erb @@ -1,13 +1,18 @@ -<%= render :partial => 'spree/admin/shared/configuration_menu' %> +<%= render :partial => 'spree/admin/shared/sub_menu/configuration' %> <% content_for :page_title do %> <%= Spree.t(:new_bank) %> <% end %> <% content_for :page_actions do %> -
  • - <%= button_link_to Spree.t(:back_to_banks_list), admin_banks_path, :icon => 'icon-arrow-left' %> -
    • + <%= link_to_with_icon 'arrow-left', Spree.t(:back_to_banks_list), admin_banks_path, :class => 'btn btn-primary' %> <% end %> -<%= render :partial => 'form' %> +<%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @bank } %> + +<%= form_for [:admin, @bank] do |f| %> +
    + <%= render :partial => 'form', :locals => { :f => f } %> + <%= render :partial => 'spree/admin/shared/new_resource_links' %> +
    +<% end %> \ No newline at end of file diff --git a/app/views/spree/admin/banks/toggle_activation.js.erb b/app/views/spree/admin/banks/toggle_activation.js.erb index f0c08fb..92e88ea 100644 --- a/app/views/spree/admin/banks/toggle_activation.js.erb +++ b/app/views/spree/admin/banks/toggle_activation.js.erb @@ -1,6 +1,10 @@ <% if @success %> $('#active-status-<%= @bank.id %>').text('<%= bank_status(@bank) %>') - $('a[href="<%= toggle_activation_admin_bank_path(@bank) %>"]').text('<%= action_to_toggle_bank_status(@bank) %>') + <% action_class = @bank.active ? "btn-danger" : "btn-success" %> + <% btn_class = "btn " + action_class + " btn-sm" %> + <% status = @bank.active ? "active" : "inactive" %> + <% bank_id = "bank-" + @bank[:id].to_s %> + $('#toggle-status-<%= @bank.id %>').html('<%= link_to_with_icon(action_text_to_toggle_bank_status(@bank), action_to_toggle_bank_status(@bank), toggle_activation_admin_bank_path(@bank), {:class => btn_class, :id => bank_id, :rel => status, :remote => true, :method => :put}) %>') <% else %> alert('<%= @bank.errors.full_messages.to_sentence %>') <% end %> \ No newline at end of file From e020d128da714dc296e4a8f88b288502fdca859c Mon Sep 17 00:00:00 2001 From: redglory Date: Fri, 10 Jul 2015 07:52:44 -0400 Subject: [PATCH 22/32] merge some 3-0-stable fixes to master --- spree_bank_transfer.gemspec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spree_bank_transfer.gemspec b/spree_bank_transfer.gemspec index 00593c6..4ccc4f4 100644 --- a/spree_bank_transfer.gemspec +++ b/spree_bank_transfer.gemspec @@ -1,8 +1,13 @@ # encoding: UTF-8 Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY +<<<<<<< HEAD s.name = 'spree-bank-transfer' s.version = '2.3.0' +======= + s.name = 'spree_bank_transfer' + s.version = '3.0.0' +>>>>>>> b779fb6... replace '-' with '_' in 'spree-bank-transfer' s.summary = 'Spree extension to create bank transfer payment method.' s.description = 'This Spree extension allows admin to provide bank transfer payment method to its users.' s.required_ruby_version = '>= 1.9.3' From e9a520be7db2b1057253843bb0b3c5c8d5611ea5 Mon Sep 17 00:00:00 2001 From: redglory Date: Fri, 10 Jul 2015 07:57:17 -0400 Subject: [PATCH 23/32] Adjust gemspec to depend on spree 3.1.0 --- spree_bank_transfer.gemspec | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/spree_bank_transfer.gemspec b/spree_bank_transfer.gemspec index 4ccc4f4..f99e445 100644 --- a/spree_bank_transfer.gemspec +++ b/spree_bank_transfer.gemspec @@ -1,13 +1,8 @@ # encoding: UTF-8 Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY -<<<<<<< HEAD - s.name = 'spree-bank-transfer' - s.version = '2.3.0' -======= s.name = 'spree_bank_transfer' - s.version = '3.0.0' ->>>>>>> b779fb6... replace '-' with '_' in 'spree-bank-transfer' + s.version = '3.1.0' s.summary = 'Spree extension to create bank transfer payment method.' s.description = 'This Spree extension allows admin to provide bank transfer payment method to its users.' s.required_ruby_version = '>= 1.9.3' @@ -21,6 +16,6 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.requirements << 'none' - s.add_dependency 'spree_core', '~> 2.3.0' + s.add_dependency 'spree_core', '~> 3.1.0' end From abc79a5ca9a2c54981a3264c4b234eec2d0de29c Mon Sep 17 00:00:00 2001 From: redglory Date: Fri, 10 Jul 2015 08:04:42 -0400 Subject: [PATCH 24/32] Adjusted gemfile, versionfile to spree master branch --- Gemfile | 8 ++++---- Versionfile | 18 +++++++----------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/Gemfile b/Gemfile index a7bae2f..5b56810 100644 --- a/Gemfile +++ b/Gemfile @@ -1,18 +1,18 @@ source 'https://rubygems.org' # Provides basic authentication functionality for testing parts of your engine -gem 'spree', '~> 2.4.0' -gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-4-stable' +gem 'spree', github: 'spree/spree' +gem 'spree_auth_devise', github: 'spree/spree_auth_devise' gem 'mysql2' group :assets do - gem 'coffee-rails', '4.0.1' + gem 'coffee-rails', '~> 4.0.0' gem 'sass-rails', '~> 4.0.2' end group :test do gem 'minitest' - gem 'rspec-rails', '~> 2.10' + gem 'rspec-rails', '~> 3.3' gem 'shoulda-matchers', '2.2.0' gem 'simplecov', :require => false gem 'database_cleaner' diff --git a/Versionfile b/Versionfile index 5db83aa..0f3e62d 100644 --- a/Versionfile +++ b/Versionfile @@ -1,11 +1,7 @@ -# This file is used to designate compatibilty with different versions of Spree -# Please see http://spreecommerce.com/documentation/extensions.html#versionfile for details - -# Examples -# -# '1.2.x' => { :branch => 'master' } -# '1.1.x' => { :branch => '1-1-stable' } -# '1.0.x' => { :branch => '1-0-stable' } -# '0.70.x' => { :branch => '0-70-stable' } -# '0.40.x' => { :tag => 'v1.0.0', :version => '1.0.0' } - +'3.1.x' => { :branch => 'master' } +'3.0.x' => { :branch => '3-0-stable' } +'2.4.x' => { :branch => '2-4-stable' } +'2.3.x' => { :branch => '2-3-stable' } +'2.2.x' => { :branch => '2-2-stable' } +'2.1.x' => { :branch => '2-1-stable' } +'2.0.x' => { :branch => '2-0-stable' } \ No newline at end of file From 457c8371da6d806c3abb69aae534e03bd3014378 Mon Sep 17 00:00:00 2001 From: redglory Date: Wed, 15 Jul 2015 14:21:55 -0400 Subject: [PATCH 25/32] erb to slim --- .../checkout/payment/_banktransfer.html.erb | 16 ---------------- .../spree/checkout/payment/_banktransfer.slim | 11 +++++++++++ 2 files changed, 11 insertions(+), 16 deletions(-) delete mode 100644 app/views/spree/checkout/payment/_banktransfer.html.erb create mode 100644 app/views/spree/checkout/payment/_banktransfer.slim diff --git a/app/views/spree/checkout/payment/_banktransfer.html.erb b/app/views/spree/checkout/payment/_banktransfer.html.erb deleted file mode 100644 index 84eb6a2..0000000 --- a/app/views/spree/checkout/payment/_banktransfer.html.erb +++ /dev/null @@ -1,16 +0,0 @@ -<% if (banks = Spree::Bank.active).any? %> - - - - - - - <% banks.each do |bank| %> - - - - - - <% end %> -
    <%= Spree.t(:bank_name) %><%= Spree.t(:account_no) %><%= Spree.t(:additional_details) %>
    <%= bank.name %><%= bank.account_no %><%= bank.additional_details %>
    -<% end %> \ No newline at end of file diff --git a/app/views/spree/checkout/payment/_banktransfer.slim b/app/views/spree/checkout/payment/_banktransfer.slim new file mode 100644 index 0000000..f416ef0 --- /dev/null +++ b/app/views/spree/checkout/payment/_banktransfer.slim @@ -0,0 +1,11 @@ +- if (banks = Spree::Bank.active).any? + table.table + tr + th = Spree.t(:bank_name) + th = Spree.t(:account_no) + th = Spree.t(:additional_details) + - banks.each do |bank| + tr + td = bank.name + td = bank.account_no + td = bank.additional_details \ No newline at end of file From 234d9fad5df03b8b96765a1d5958bb9795226a8d Mon Sep 17 00:00:00 2001 From: redglory Date: Tue, 28 Jul 2015 19:17:43 +0100 Subject: [PATCH 26/32] localize datepicker and fixed hide/show bank payment form javascript --- .../spree/frontend/spree_bank_transfer.js.erb | 17 +++++++--- .../spree/frontend/spree_bank_transfer.css | 8 +++-- .../add_bank_details_form_to_order_show.rb | 29 +---------------- .../spree/orders/_bank_transfer_form.html.erb | 31 +++++++++++++++++++ 4 files changed, 51 insertions(+), 34 deletions(-) create mode 100644 app/views/spree/orders/_bank_transfer_form.html.erb diff --git a/app/assets/javascripts/spree/frontend/spree_bank_transfer.js.erb b/app/assets/javascripts/spree/frontend/spree_bank_transfer.js.erb index a0dd0dc..5677399 100644 --- a/app/assets/javascripts/spree/frontend/spree_bank_transfer.js.erb +++ b/app/assets/javascripts/spree/frontend/spree_bank_transfer.js.erb @@ -1,6 +1,7 @@ //= require jquery-ui/datepicker + $(document).ready(function() { - $('#banktransfer_instructions').click(function(event) { + $('#banktransfer_instructions').on("click", function(event) { newwindow = window.open($(this).attr('href'), 'bank transfer', 'left=20,top=20,width=650,height=750,toolbar=0,resizable=0,scrollbars=1'); if (window.focus) { newwindow.focus(); @@ -8,14 +9,21 @@ $(document).ready(function() { return false; }); - $('[name="payment[deposited_on]"]').datepicker({dateFormat: '<%= Spree.t(:js_format, :scope => "date_picker", :default => "yy/mm/dd") %>'}); + var options = $.extend( + {}, // empty object + $.datepicker.regional['<%= I18n.default_locale %>'], // I18n locale + {dateFormat: '<%= Spree.t(:js_format, :scope => "date_picker", :default => "yy/mm/dd") %>', + firstDay: '<%= Spree.t(:first_day, :scope => "date_picker", :default => "0") %>'} + ); + $.datepicker.setDefaults(options); + $('[name="payment[deposited_on]"]').datepicker(); - $('.add_bt_details').click(function() { + $('.add_bt_details').on("click", function() { $(this).hide(); $('.bt_payment_form').show(); }); - $('.bt_payment_form input[type="submit"]').click(function(event) { + $('.bt_payment_form input[type="submit"]').on("click", function(event) { var empty_fields = $('.required_field').filter(function() { return !$(this).val().trim().length }), empty_fields_names = [] if ($(empty_fields).length) { $(empty_fields).each(function() { @@ -28,3 +36,4 @@ $(document).ready(function() { } }); }); + diff --git a/app/assets/stylesheets/spree/frontend/spree_bank_transfer.css b/app/assets/stylesheets/spree/frontend/spree_bank_transfer.css index 6774745..e63e51b 100644 --- a/app/assets/stylesheets/spree/frontend/spree_bank_transfer.css +++ b/app/assets/stylesheets/spree/frontend/spree_bank_transfer.css @@ -1,7 +1,11 @@ /* -*= require jquery.ui.datepicker + *= require jquery-ui + *= require jquery-ui/datepicker */ - +.ui-datepicker { + width: 18em; /* fix calendar width */ + padding: .2em .2em 0; +} .bt_payment_form { margin-left: -10px; } .bt_payment_form table { border-collapse: inherit; } .bt_payment_form [type="submit"] { margin-left: 10px; } diff --git a/app/overrides/add_bank_details_form_to_order_show.rb b/app/overrides/add_bank_details_form_to_order_show.rb index 92b51b7..e6e4ec4 100644 --- a/app/overrides/add_bank_details_form_to_order_show.rb +++ b/app/overrides/add_bank_details_form_to_order_show.rb @@ -2,32 +2,5 @@ :virtual_path => 'spree/shared/_order_details', :name => 'add_bank_details_form_to_order_show', :insert_bottom => ".payment-info", - :text => %q{ - <% if bank_transfer_payment = @order.payments.from_bank_transfer.first %> - <% unless bank_transfer_payment.details_submitted? %> -
    - <%= link_to Spree.t(:add_details), "javascript:void(0);", :class => 'button add_bt_details' %> - <% end %> - <%= form_for bank_transfer_payment, :html => { :class => "bt_payment_form #{bank_transfer_payment.details_submitted? ? '' : 'hidden'}" } do |f| %> - - - - - - - - - - - - - -
    <%= Spree.t(:deposited_on) %><%= f.text_field :deposited_on, :disabled => bank_transfer_payment.details_submitted?, :class => 'required_field', 'field-name' => 'Deposited on' %>
    <%= Spree.t(:bank_name) %><%= f.text_field :bank_name, :disabled => bank_transfer_payment.details_submitted?, :class => 'required_field', 'field-name' => 'Bank name' %>
    <%= Spree.t(:account_no) %><%= f.text_field :account_no, :disabled => bank_transfer_payment.details_submitted?, :class => 'required_field', 'field-name' => 'Account No.' %>
    <%= Spree.t(:transaction_reference_no) %><%= f.text_field :transaction_reference_no, :disabled => bank_transfer_payment.details_submitted?, :class => 'required_field', 'field-name' => 'Transaction Reference No.' %>
    -
    - <% unless bank_transfer_payment.details_submitted? %> - <%= f.submit "Submit", :confirm => Spree.t(:confirm_details_submit) %> - <% end %> - <% end %> - <% end %> - } + :partial => "spree/orders/bank_transfer_form" ) diff --git a/app/views/spree/orders/_bank_transfer_form.html.erb b/app/views/spree/orders/_bank_transfer_form.html.erb new file mode 100644 index 0000000..d7ca1ad --- /dev/null +++ b/app/views/spree/orders/_bank_transfer_form.html.erb @@ -0,0 +1,31 @@ +<% if bank_transfer_payment = @order.payments.from_bank_transfer.first %> + <% unless bank_transfer_payment.details_submitted? %> +
    + <%= link_to Spree.t(:add_details), "javascript:void(0);", :class => 'button add_bt_details' %> + <% end %> + <%= form_for bank_transfer_payment, :html => { :class => "bt_payment_form", :style => "#{bank_transfer_payment.details_submitted? ? '' : 'display:none;'}" } do |f| %> + + + + + + + + + + + + + +
    <%= Spree.t(:deposited_on) %><%= f.text_field :deposited_on, :disabled => bank_transfer_payment.details_submitted?, :class => 'required_field', 'field-name' => 'Deposited on' %>
    <%= Spree.t(:bank_name) %><%= f.text_field :bank_name, :disabled => bank_transfer_payment.details_submitted?, :class => 'required_field', 'field-name' => 'Bank name' %>
    <%= Spree.t(:account_no) %><%= f.text_field :account_no, :disabled => bank_transfer_payment.details_submitted?, :class => 'required_field', 'field-name' => 'Account No.' %>
    <%= Spree.t(:transaction_reference_no) %><%= f.text_field :transaction_reference_no, :disabled => bank_transfer_payment.details_submitted?, :class => 'required_field', 'field-name' => 'Transaction Reference No.' %>
    +
    + <% unless bank_transfer_payment.details_submitted? %> + <%= f.submit "Submit", :confirm => Spree.t(:confirm_details_submit) %> + <% end %> + <% end %> +<% end %> + + +<% if I18n.locale != :en %> + <%= javascript_include_tag "jquery-ui/datepicker-#{I18n.locale}" %> +<% end %> \ No newline at end of file From c60f34a96153ec1817b26473c1a88b8db9b12283 Mon Sep 17 00:00:00 2001 From: redglory Date: Fri, 5 Aug 2016 11:25:10 +0100 Subject: [PATCH 27/32] pushed 3-1-stable --- spree_bank_transfer.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spree_bank_transfer.gemspec b/spree_bank_transfer.gemspec index b57de98..f99e445 100644 --- a/spree_bank_transfer.gemspec +++ b/spree_bank_transfer.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = 'spree_bank_transfer' - s.version = '3.0.0' + s.version = '3.1.0' s.summary = 'Spree extension to create bank transfer payment method.' s.description = 'This Spree extension allows admin to provide bank transfer payment method to its users.' s.required_ruby_version = '>= 1.9.3' @@ -16,6 +16,6 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.requirements << 'none' - s.add_dependency 'spree_core', '~> 3.0.0.rc2' + s.add_dependency 'spree_core', '~> 3.1.0' end From 7893518e3b358b71e8d4edcca5df0888d8870d17 Mon Sep 17 00:00:00 2001 From: redglory Date: Sat, 18 Feb 2017 12:58:37 +0000 Subject: [PATCH 28/32] added verion 'master' --- Gemfile | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Gemfile diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..9a3e858 --- /dev/null +++ b/Gemfile @@ -0,0 +1,22 @@ +source 'https://rubygems.org' + +# Provides basic authentication functionality for testing parts of your engine +version = 'master' +gem 'spree', github: 'spree/spree', version +gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: version + +gem 'mysql2' + +group :assets do + gem 'coffee-rails', '~> 4.0.0' + gem 'sass-rails', '~> 4.0.2' +end + +group :test do + gem 'minitest' + gem 'rspec-rails', '~> 3.3' + gem 'shoulda-matchers', '2.2.0' + gem 'simplecov', :require => false + gem 'database_cleaner' +end +gemspec From a54192bdd769d5469cef9b070b64ca6a44f073fe Mon Sep 17 00:00:00 2001 From: redglory Date: Sat, 18 Feb 2017 13:01:48 +0000 Subject: [PATCH 29/32] spree_core dependant of '>= 3.1.0, < 4.0' --- spree_bank_transfer.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spree_bank_transfer.gemspec b/spree_bank_transfer.gemspec index f99e445..8df7858 100644 --- a/spree_bank_transfer.gemspec +++ b/spree_bank_transfer.gemspec @@ -16,6 +16,6 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.requirements << 'none' - s.add_dependency 'spree_core', '~> 3.1.0' + s.add_dependency 'spree_core', '>= 3.1.0', '< 4.0' end From 775b87d38be4e433a04d4818fbdac83afbf5521d Mon Sep 17 00:00:00 2001 From: redglory Date: Mon, 25 Sep 2017 00:47:39 +0100 Subject: [PATCH 30/32] updated jquery_ui/datepicker source --- .../spree/frontend/spree_bank_transfer.js.erb | 2 +- app/helpers/.DS_Store | Bin 6148 -> 0 bytes app/helpers/spree/.DS_Store | Bin 6148 -> 0 bytes app/models/.DS_Store | Bin 6148 -> 0 bytes app/models/spree/.DS_Store | Bin 6148 -> 0 bytes app/views/.DS_Store | Bin 6148 -> 0 bytes app/views/spree/checkout/.DS_Store | Bin 6148 -> 0 bytes lib/generators/spree_bank_transfer/.DS_Store | Bin 6148 -> 0 bytes 8 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 app/helpers/.DS_Store delete mode 100644 app/helpers/spree/.DS_Store delete mode 100644 app/models/.DS_Store delete mode 100644 app/models/spree/.DS_Store delete mode 100644 app/views/.DS_Store delete mode 100644 app/views/spree/checkout/.DS_Store delete mode 100644 lib/generators/spree_bank_transfer/.DS_Store diff --git a/app/assets/javascripts/spree/frontend/spree_bank_transfer.js.erb b/app/assets/javascripts/spree/frontend/spree_bank_transfer.js.erb index 5677399..a283977 100644 --- a/app/assets/javascripts/spree/frontend/spree_bank_transfer.js.erb +++ b/app/assets/javascripts/spree/frontend/spree_bank_transfer.js.erb @@ -1,4 +1,4 @@ -//= require jquery-ui/datepicker +//= require jquery-ui/widgets/datepicker $(document).ready(function() { $('#banktransfer_instructions').on("click", function(event) { diff --git a/app/helpers/.DS_Store b/app/helpers/.DS_Store deleted file mode 100644 index fc50dc1e07ad6264c9111663aae8d0ffd2dc3d05..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}T>S5T5OiCa92$(BtB{NUPTN;30$x9)%Wqu%ZbmG*Ft-r1VguLGXEe8=uFS z-L()5J&NcI?0&QJv%C2qyE_0Nyj9o+Z~(xJ#1S|6fPt=0GTE!(yZ$D?Q-#%nKL&BNqwFpbxPD4YcT z@?PnwpRN+mUnGwX{8q77K2Sw;qM4c*3i6L}4+NFte4dxnk zItaBg&SO^oDqe(I9qm$ugK#x+&kQgFMFy&R=+OOtjlWE3kzY*V5i`IH{4oYZtv~2{ z_)+F={q}iu*Gg=U*hnZYCj|xd!Xp3&bdEHXQ~M?980Q+yHPS3(SLulS5Kx40#|-=c F1D~pgLaYD) diff --git a/app/helpers/spree/.DS_Store b/app/helpers/spree/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0CJY@sHlO)XNRLGbtZZ~Q&Z z>~57(_25CI%)sn7na3{sZP*6@2zL@z0g3=%p%Uh7Y`zeRlP*clcnF2+qYDuv(1Ba% zE@iXhKQcgTw*y1);a;uU=lUhkgBZeKIvxgtIKaHuU^wWHlS<`Hb^5mESX5cpr(EcD%2_1u(MzwWdL)S-&7YIqv zrndy4H0T)2G-3or=u$*oD$El@=yLQ+ljj)BH0p8?YGmxkj4aFxMX1ryFI74SMHI(Y{{6pL#9zz+Gq6$&h(g0_xHu(qwk}PM&RU6jjY>j!nZ}P2G}KXy fxpWklP?exxl7Z+L%rv40g)ah%25y*vKV{$@O~6if diff --git a/app/views/.DS_Store b/app/views/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0S5T3QwCa92$=yCB}q*b97JcLleqtHSRRx}}n25M89lp--255A6%;B^aBX7ZU93^R^@h&zh)y=J%W!u)ypdU@bc;UtKNtj%BNAaQ? zg~Py~-6%Wt(|O|gGZne=(-B6L-HYQf+5?l_kHU0x>+EOQajRLE?RH+5S*z8k%hQvy zJhv^&c3!Q$!=v-do}WGDPtTe_L3<|I)vz32mKGb#05iZ0FaylMdIrorVr{Qa;RrLp z4E$3D=zNfR2AF|A#(=1H zx*ZQ+%G|BrUXSitiF$`hLU{!lC}^+z1mJ|ukpmUfaY;7jxdsc3vS5T0$TO;Dj1p~uB@kyfqk!9xfYJPIxJU_}!mHV~51r1nswLGXEe8=uFS z-7Q$HR}nh{yWi~m>}Ed5{s4e*XF&^~1^^Z|LP5$JA@f>S$pjM$HHQZgME*RT_|ck) z{-TM#y$T`3kU|EZzCZEN^X5;YFwL6HcTp-=wzjL5ZCkseVHgL=+)ZY2kY4r2$-Ey1 zcfL2hR(j@Tv()vb%5&*uWArF}kR%c6BNIIggKT_Lt1lKu?RG=9PP=(SE;^lNL!KOW z^W3&9yY_1B9~_=t47|tu>ABDh3M5;}p1~!&pz@`dhyFB*unW0cPN5255hf*a#hig+{e?U`N+y@>d8+P^Y&9p)}|iEHt7AMd(yS zohr-|L+Et0OB3f9EHvtL5Nc(d$E>`3ya=^A+NBBy;b`QZ8DIuh87S*vjn4mb{AJcY z@>f%M#0)S4|BL}q>GgXq7G=)XZ{^WhE3w^TBcZs06cp4~E&({8eWb3O+Am4RILBb2 Vk!B&gN=M|2fFguDX5beX_y7{8N#g(j From bd58396a4d05f9fdc3f91beaceddd2e96ccdb5f0 Mon Sep 17 00:00:00 2001 From: redglory Date: Sun, 25 Nov 2018 20:56:33 +0000 Subject: [PATCH 31/32] fixed before_filter --- app/controllers/spree/payments_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/spree/payments_controller.rb b/app/controllers/spree/payments_controller.rb index e4ff2f3..a6d5b72 100644 --- a/app/controllers/spree/payments_controller.rb +++ b/app/controllers/spree/payments_controller.rb @@ -1,7 +1,7 @@ module Spree class PaymentsController < Spree::StoreController - before_filter :authenticate_spree_user! - before_filter :find_payment + before_action :authenticate_spree_user! + before_action :find_payment def update payment_details = PaymentDetails.new(@payment, payment_params) From 2d9476f0abae1275f952dae9422dc75441fbb669 Mon Sep 17 00:00:00 2001 From: redglory Date: Sun, 25 Nov 2018 20:58:08 +0000 Subject: [PATCH 32/32] bump version --- spree_bank_transfer.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spree_bank_transfer.gemspec b/spree_bank_transfer.gemspec index 8df7858..5db479e 100644 --- a/spree_bank_transfer.gemspec +++ b/spree_bank_transfer.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY s.name = 'spree_bank_transfer' - s.version = '3.1.0' + s.version = '3.1.1' s.summary = 'Spree extension to create bank transfer payment method.' s.description = 'This Spree extension allows admin to provide bank transfer payment method to its users.' s.required_ruby_version = '>= 1.9.3'