Luis Ramos
9bbef16804
Converting all calls to ActiveRelation#sum to use a symbol with &
...
This is only applicable to database columns, if we are summing using a method in the model than the & is required!
2020-11-27 13:59:46 +00:00
Luis Ramos
974240fd4b
Fix two sum calls in checkout helper
2020-11-27 13:59:46 +00:00
Luis Ramos
23956726e9
Add missing translation
2020-11-04 12:37:55 +00:00
Luis Ramos
805b4d243e
Fix missing translations
2020-11-04 12:15:45 +00:00
Luis Ramos
eea73aa989
Merge pull request #5919 from luisramos0/injector_refactor_for_rails41
...
[Rails 4.1, works in master] Convert relations with to_a so that they work in rails 4.1
2020-10-31 09:33:27 +00:00
Luis Ramos
71a181341b
Fix bug in terms_and_conditions_helper related to guest checkout where current_user is nil and T&Cs must be shown all the time
2020-10-30 15:09:13 +00:00
Luis Ramos
ad592785cf
Rename methods to follwo ruby convention and improve readability
2020-10-30 15:09:13 +00:00
Luis Ramos
f3ba0ebdbb
Move code to a new helper
2020-10-30 15:09:13 +00:00
Luis Ramos
1847b62cf4
Fix some rubocop issues
2020-10-30 10:12:56 +00:00
Luis Ramos
d15301021a
Rename inject_json_list to inject_json_array
2020-10-30 10:12:56 +00:00
Luis Ramos
65ce183830
Make checkout_adjustments_for handle adjustments if a relation is given
2020-10-30 10:10:54 +00:00
Luis Ramos
08d26102d2
Separate injection methods so that we can have a separate behaviour for lists without having to check their types
...
This change is required for rails 4.1 where the relations api changed
2020-10-30 10:10:54 +00:00
Andy Brett
866452383d
rubocop fix
2020-10-29 09:17:49 -07:00
Andy Brett
4f579facfe
move all_units to admin helper
2020-10-29 09:17:49 -07:00
Andy Brett
fa62ec0bff
only show available units for products
2020-10-29 09:17:49 -07:00
Luis Ramos
0f06195baa
Remove Image settings page, these settings will come from ofn-install now
2020-10-20 11:20:37 +01:00
Maikel
8c65498661
Merge pull request #5998 from andrewpbrett/shipping-per-pound
...
Per-pound shipping calculator
2020-10-16 15:27:57 +11:00
Andy Brett
fdb1019ee2
fix styles per rubocop
2020-09-17 16:41:49 -07:00
Andy Brett
988abf7a8c
update preference field interface to be more clear
2020-09-17 08:27:45 -07:00
Luis Ramos
f566c2127d
Merge pull request #5924 from luisramos0/basic_spree_core
...
[Bye bye spree] Bring base_helper and log_entry from spree core
2020-09-16 14:57:41 +01:00
Andy Brett
d32ed6b48f
improve styling on calculators UI
2020-09-12 10:43:14 -07:00
Andy Brett
c618ba3b2c
style fixes
2020-09-07 13:44:42 -07:00
Andy Brett
5a5cbbd318
add drop down list for unit preference
2020-09-07 13:26:09 -07:00
Luis Ramos
b2cf414fb8
Use exiting translation
2020-09-01 17:09:22 +01:00
Luis Ramos
5958c2f68c
Rubocop autocorrect
2020-09-01 17:09:22 +01:00
Luis Ramos
b9f7a98c46
Bring image, asset and images_helper from spree_core
2020-09-01 17:09:22 +01:00
Luis Ramos
2f93a06dd5
Run rubocop -a on files brought from spree_core
2020-09-01 09:46:41 +01:00
Luis Ramos
c151195e3a
Merge decorator with original class and delete dead code
2020-09-01 09:46:41 +01:00
Luis Ramos
7ec00cf40a
Bring base files from spree_core
2020-09-01 09:45:11 +01:00
Pau Pérez Fabregat
4984cc9758
Merge branch 'master' into ctry_zone
2020-08-28 09:21:57 +02:00
Luis Ramos
5b3e350204
Rename zone.country_list to zone.countries
2020-08-26 23:12:48 +01:00
Steve Roberts
ac69bef459
Fix issues raised by linter
2020-08-20 17:16:20 +01:00
Steve Roberts
debbf9b361
Modify payment_list partial to be shared
...
- Partial is used by both the invoice pdf and the order confirmation email
- separate scss file for new payment list table
- extracted outstanding balance logic (also changed in payments view.. admin/orders/RXXX/payments)
- translations in shared.payments_list and lazy loaded
2020-08-20 17:16:20 +01:00
Matt-Yorkley
96138e9129
Refactor UserLocaleSetter public methods
2020-07-04 10:15:35 +02:00
Matt-Yorkley
f08a530877
Make #valid_locale_for_user an instance method
2020-07-04 09:51:00 +02:00
Matt-Yorkley
0c2fd4bfd2
Fix ensure_valid_locale_persisted and change public interface of service
2020-07-03 16:39:24 +02:00
Matt-Yorkley
02549d1b0f
Extract all locale-setting logic to a service
2020-07-03 13:44:13 +02:00
Matt-Yorkley
c726340ba3
Extract #save_locale_from_params comment-method
2020-07-03 11:48:39 +02:00
Matt-Yorkley
91880cdbec
Make I18nHelper #available_locale? method public
2020-07-02 14:35:59 +02:00
Matt-Yorkley
d70d61439a
Always return an available locale
2020-07-02 14:35:59 +02:00
Matt-Yorkley
aa6f4d4fb9
Don't set unavailable locales on the current user
2020-07-02 14:35:59 +02:00
Matt-Yorkley
8dfaea629b
Refactor current_user_locale to a new method
2020-07-02 14:35:59 +02:00
Luis Ramos
0ba1642bd2
Fix rubocop issues
2020-06-22 17:39:20 +01:00
Luis Ramos
b879439d58
Use rubocop auto correct to fix Style/SafeNavigation issue
2020-06-22 16:51:46 +01:00
Luis Ramos
1b6e51c79e
Fix rubocop issue
2020-06-22 16:51:46 +01:00
Luis Ramos
f848a89a00
Rename update_attributes to update #rails4
2020-06-22 16:51:43 +01:00
Luis Ramos
8a9dae0ee2
Run rubocop autocorrect
...
This is the result of bundle exec rubocop --auto-correct
2020-06-22 12:23:10 +01:00
Matt-Yorkley
b189d06eb7
Update shopping CTA logic
...
Shows "Take me shopping!" button on /shops page if a shop is selected
2020-06-19 08:59:43 +02:00
Matt-Yorkley
2bcadd52e8
Hide "Take me shopping" button on /shop and /shops pages
2020-06-18 22:21:55 +02:00
François Turbelin
b4952dcbfb
Cosmetics
2020-06-16 14:01:27 +02:00
