luisramos0
dc701f55b3
Extract calculators factories to separate file
2019-06-14 12:23:32 +01:00
luisramos0
06e3328ce2
Extract orders factories to separate file
2019-06-14 12:17:24 +01:00
luisramos0
91fcb7c7c4
Extract enterprises factories to separate file
2019-06-14 12:12:45 +01:00
luisramos0
42f2e78b10
Extract subscriptions factories to separate file
2019-06-14 12:10:54 +01:00
luisramos0
0501859c23
Extract order_cycle factories to separate file
2019-06-14 12:10:27 +01:00
luisramos0
a7c970054c
Add rescue in product controller create action to avoid server error and send appropriate error message to client when product image upload fails
2019-06-14 10:20:28 +01:00
luisramos0
c97925aa4a
Improve message in private shopfront when closed or when user is not logged in
2019-06-14 10:13:33 +01:00
Maikel Linke
ac79e44d9a
Fix current rubocop violations
2019-06-14 11:40:09 +10:00
luisramos0
1db220e1e0
Remove unnecessary referer setting from products controller spec
2019-06-13 17:22:09 +01:00
Luis Ramos
e15ccdbd74
Merge pull request #3840 from mkllnk/3727-default-credit-cards
...
Make only reusable credit cards the default card
2019-06-13 14:13:32 +01:00
Luis Ramos
1a2703f630
Merge pull request #3886 from luisramos0/fees_translations
...
Make a few more things translatable in the Enterprise Fees management page
2019-06-13 14:12:16 +01:00
Luis Ramos
09a5426095
Merge pull request #3880 from kristinalim/fix/3792-optimize_order_cycle_variant_updates
...
3792 Optimize saving Order Cycle changes
2019-06-13 12:33:22 +01:00
Luis Ramos
bb7a2d7a5e
Merge pull request #3252 from mllocs/fix/navbar-right-items-styles
...
Top navbar redesign and cleanup
2019-06-13 12:04:20 +01:00
Matt-Yorkley
785595a951
Reduce initial queries on shop page by ~95%
2019-06-12 09:47:01 +01:00
Matt-Yorkley
a91ae8947b
Only query visible enterprises
2019-06-12 09:47:01 +01:00
Matt-Yorkley
4155b17633
Remove tests that reference removed code
2019-06-12 09:47:01 +01:00
Matt-Yorkley
4ec46c2db6
Fix groups index page
2019-06-12 09:47:01 +01:00
Matt-Yorkley
aca1f92060
Adapt specs to new loading methods
2019-06-12 09:47:01 +01:00
Matt-Yorkley
ae8f1a92e8
Remove "profiles" from /shops
2019-06-12 09:47:01 +01:00
Matt-Yorkley
698d3672a6
List only current taxons for active enterprises
2019-06-12 09:47:01 +01:00
Matt-Yorkley
e329b4bfb0
Improve queries for serializers
2019-06-12 09:47:01 +01:00
Pau Pérez Fabregat
fd95ae7e41
Merge pull request #3847 from Matt-Yorkley/api_access
...
Allow unauthenticated access to OFN API endpoints
2019-06-12 09:45:11 +02:00
luisramos0
f23094df09
Fix file name of js unit test files in admin/order_cycles/controllers
2019-06-11 21:28:55 +01:00
luisramos0
6cf705ea55
In the order cycle pages (both create and edit, both simple and normal), add OC coordinator to schedules request to the server and make the controller filter schedules of order cycles coordinated by that enterprise id.
2019-06-11 21:28:52 +01:00
Maikel Linke
5c72c35060
Use better credit card factory for subs specs
...
The specs for subscriptions were creating simple one-time-use credit
cards. They should not be used for subscriptions. After this was fixed
in previous commits, these integration tests failed. Now we use a new
factory that mimics stored credit cards that can be used for
subscriptions.
2019-06-11 18:01:41 +01:00
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
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
70614de955
Require product import rows to match unit of preceding rows
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
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
1a4e83d633
Change products controller to clear variants unit description if variant_unit is items
2019-06-01 16:56:17 +01:00
luisramos0
1d4529092f
Make fee type options in enterprise fees page translatable
2019-05-30 00:46:20 +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
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
79f16e0ea3
Run transpec in spec/features/consumer/external_services_spec.rb
2019-05-28 17:04:06 +01:00
luisramos0
7397ab4fd8
Run transpec in spec/features/admin/payment_method_spec.rb
2019-05-28 17:04:06 +01:00
luisramos0
ec7e92202b
Run transpec in spec/features/admin/enterprise_user_spec.rb and spec/features/admin/overview_spec.rb
2019-05-28 17:04:06 +01:00
luisramos0
9a21ca38e1
Run transpec in a few more spec/features/admin specs
2019-05-28 17:04:06 +01:00
luisramos0
d2f62f86a9
Run transpec in a few spec/features/admin specs
2019-05-28 16:59:51 +01:00
luisramos0
80537e7e01
Run transpec in spec/features/admin/image_settings_spec.rb
2019-05-28 16:57:11 +01:00
luisramos0
7f43a66fb3
Run transpec in spec/features/admin/adjustments_spec
2019-05-28 16:57:11 +01:00
Kristina Lim
99f163d294
Make code style changes for spec file
2019-05-28 21:32:25 +08:00
Kristina Lim
ea8d189d6c
Bulk update OC variant changes in OC form
2019-05-28 21:27:43 +08:00
Kristina Lim
bc6f14105e
Require spec_helper.rb in spec file for OC form applicator
2019-05-28 21:26:33 +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
Pau Pérez Fabregat
2d3bd7f471
Merge pull request #3828 from eelcodevlieger/webdrivers
...
Webdrivers
2019-05-27 11:20:04 +02:00
luisramos0
4143c50b1f
Move joyride translations to the correct path
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