Maikel Linke
b3b8cb778f
Make only reusable credit cards the default card
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/3727
When a user didn't have a default credit card and then checked out with
a credit card it became the default even when the user didn't intend to
store it. That lead to subscriptions trying to charge a one-time card
which fails.
2019-06-11 18:01:41 +01:00
luisramos0
d8a7f60f40
Make subs radio button visible to all managers
2019-06-11 17:21:13 +01:00
Maikel Linke
a10bb5acbd
Consider deleted products when creating permalinks
...
https://github.com/openfoodfoundation/openfoodnetwork/issues/3844
Spree's implementation and our implementation to create a unique
permalink failed to notice conflicts with soft-deleted products. This
patch looks at deleted products as well.
2019-06-11 18:20:41 +10:00
Kristina Lim
cf11ef8ba2
Ignore parameter list length for ProductImport::EntryValidator
...
This can be done in a separate PR. More tests might be needed when
extracting to a class.
2019-06-10 04:20:04 +08:00
Kristina Lim
8c69ee67b8
Refactor code for validating variant in reference to existing product
2019-06-10 04:20:04 +08:00
Kristina Lim
70614de955
Require product import rows to match unit of preceding rows
2019-06-10 04:20:03 +08:00
Kristina Lim
5d282f7e9f
Update code layout in ProductImporter method
2019-06-10 04:20:03 +08:00
Kristina Lim
73b388da87
Simplify product import all_entries method
2019-06-10 04:20:03 +08:00
Kristina Lim
38519b2bae
Simplify building of product import entries for range
2019-06-10 04:19:50 +08:00
Kristina Lim
37101a6b64
Extract build_entries_from_rows for product import
2019-06-09 23:38:36 +08:00
Luis Ramos
568e3003ba
Merge pull request #3882 from kristinalim/feature/3408-enable_enterprise_fee_summary_for_non_superadmin
...
3408 Remove feature flag for Enterprise Fee Summary
2019-06-06 16:28:36 +01:00
luisramos0
9944f3e1e6
Make translations of tooltips in subscriptions list page work again
2019-06-04 20:59:45 +01:00
luisramos0
cfcf73b6a1
Make save and saving messages translatable in subscriptions items panel
2019-06-04 20:59:45 +01:00
luisramos0
eb42e81afc
Make some text entries translatable in create subscription pages: title in step 1 details and 4 review and date placeholders in step 1 details
2019-06-04 20:59:45 +01:00
luisramos0
64af81a4a2
Make search_by_email text translatable in subscriptions list page
2019-06-04 20:59:42 +01:00
Luis Ramos
fd64e53f61
Merge pull request #3841 from luisramos0/2-0-fix-ship-methods-translations
...
Move shipping methods translations to lazy lookups
2019-06-04 15:15:31 +01:00
Kristina Lim
2c52c1a6fc
Remove unused argument from Spree::Ability method
2019-06-02 01:30:46 +08:00
luisramos0
1a4e83d633
Change products controller to clear variants unit description if variant_unit is items
2019-06-01 16:56:17 +01:00
luisramos0
4551149532
Improve code of weight calculator
2019-05-31 19:55:39 +01:00
luisramos0
82955b9fe5
Make weight calculator use line_item.final_weight_volume rather than variant.weight for cases where the final weight is set manually in the BOM
2019-05-31 19:55:17 +01:00
luisramos0
32c107ab5a
move translation to use relative path so that the new translation key is used
2019-05-30 23:26:23 +01:00
Masha
436a2ba0a2
went much shorted way
2019-05-30 23:08:05 +01:00
Masha
412fffba1d
the translations for Remove in the exchange forms added
2019-05-30 23:08:05 +01:00
luisramos0
5024da4123
Make tag rules type descriptions in the management page translatable
2019-05-30 20:39:58 +01:00
luisramos0
6620243603
Make the submit button on the add tag rule dialog translatable
2019-05-30 20:22:02 +01:00
luisramos0
1d4529092f
Make fee type options in enterprise fees page translatable
2019-05-30 00:46:20 +01:00
luisramos0
5719455731
Make enterprise fees name placeholder translatable
2019-05-29 21:33:30 +01:00
luisramos0
c5a95dee79
Remove matching of product shipping category with shipping method's category to allow users to checkout products with categories not supported by the shipping methods.
...
See issue #3884 for more details.
2019-05-29 14:43:19 +01:00
Matt-Yorkley
563f9a4f5f
Remove another N+1
2019-05-29 12:28:56 +01:00
Matt-Yorkley
2dd4c1ccaf
Cut OC edit #for_order_cycle queries in half
2019-05-29 10:01:46 +01:00
Matt-Yorkley
8733036fb0
Remove 2 N+1s, reduce queries in #visible action ~90%
2019-05-29 10:01:44 +01:00
Matt-Yorkley
c0a40c616b
Use devise's check_authorization and skip_authorization_check
2019-05-28 22:02:18 +01:00
Kristina Lim
ecea0600b6
Remove feature flag for Enterprise Fee Summary
2019-05-29 02:50:41 +08:00
luisramos0
f2bfb9bedb
Fix rubocop issues in adjustment_decorator, line_item_decorator and product_decorator
2019-05-28 16:50:59 +01:00
luisramos0
ced6264846
Fix rubocop issues in enterprise model
2019-05-28 16:30:50 +01:00
luisramos0
f58d9ec790
Fix rubocop issues in exchange model
2019-05-28 16:10:40 +01:00
luisramos0
06c0b1375b
Fix rubocop issues in enterprise_relationship model
2019-05-28 16:07:10 +01:00
luisramos0
ffbd79d3dd
Change all model scopes without a callable object to use a proc
2019-05-28 15:55:13 +01:00
Kristina Lim
ea8d189d6c
Bulk update OC variant changes in OC form
2019-05-28 21:27:43 +08:00
luisramos0
07854cf372
Fix a few problems introduced by rubocop auto correct
2019-05-28 12:57:29 +01:00
luisramos0
86b0d71c7e
Result of rubocop auto-correct and rebuilding rubocop_manual_todo
2019-05-28 12:57:29 +01:00
luisramos0
4a67acf954
Removing a few rubocop warnings
2019-05-28 12:55:17 +01:00
Luis Ramos
9ccf502365
Merge pull request #3797 from lin-d-hop/variant-master-price
...
Remove non-functional Price field from Edit Product screen
2019-05-28 10:30:05 +01:00
luisramos0
dc32d282a6
Fix some rubocop issues in menu css file
2019-05-24 23:54:00 +01:00
luisramos0
2654db7c82
Add new menu style as per design
2019-05-24 23:53:56 +01:00
luisramos0
0dc0776705
Separate mobile menu cart code from large menu cart code
2019-05-24 15:17:41 +01:00
luisramos0
ec9d50c824
Add new cart icon and extract cart joyride from cart haml file
2019-05-24 15:16:36 +01:00
luisramos0
60c08347a5
Extract language selector from large menu haml file, add language name and clean up the code that generates the shopping@ label
2019-05-24 15:12:31 +01:00
Luis Ramos
db0c874622
Merge pull request #3669 from luisramos0/2-0-without-spree-fe-views
...
[Spree Upgrade] Remove dependency to spree frontend - views and assets
2019-05-24 14:37:34 +01:00
Luis Ramos
4a321f200f
Merge pull request #3783 from kristinalim/fix/3782-missing_translation
...
3782 Fix missing translation in subscription update modal
2019-05-23 18:45:20 +01:00
