Luis Ramos
b02bf3b83c
Merge pull request #3872 from luisramos0/rails4_where_scope
...
[Rails 4] Change all model scopes without a callable object to use a proc
2019-06-12 12:53:10 +01:00
Matt-Yorkley
698d3672a6
List only current taxons for active enterprises
2019-06-12 09:47:01 +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
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
Kristina Lim
2c52c1a6fc
Remove unused argument from Spree::Ability method
2019-06-02 01:30:46 +08: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
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
luisramos0
86b0d71c7e
Result of rubocop auto-correct and rebuilding rubocop_manual_todo
2019-05-28 12:57:29 +01:00
Maikel
50ca1f7173
Merge pull request #3824 from mkllnk/aus-content-updates
...
Aus content updates
2019-05-10 10:40:09 +10:00
Maikel Linke
a97792cbc3
Remove story from code comment
2019-05-09 11:57:13 +10:00
Maikel Linke
a3adbd9fc8
Replace connect-learn banner with custom content
...
The connect and learn banner is only used in Australia at the moment. We
would like to have customisable content here. Now every instance can
choose to place a custom alert banner at the top. Unfortunately, custom
banners are not translated into other languages. That's why I kept the
standard register call. For example, the register call is in use where
it is displayed in French and Italian. Completely switching to custom
content would break the translation.
Translations in custom content are an existing feature request,
"multi-lang 2.0".
2019-05-08 11:38:49 +10:00
Luis Ramos
4c767cd5b4
Merge pull request #3802 from kristinalim/fix/order_cycle_optimizations
...
3760 Optimizations related to OCs
2019-05-07 21:12:44 +01:00
Pau Pérez Fabregat
fc38906e60
Merge pull request #3672 from Matt-Yorkley/spree2/pi_shipping_category
...
[Spree Upgrade] shipping_category now required for products
2019-05-07 16:12:05 +02:00
Kristina Lim
7593168341
Update code style for Enterpise.not_ready_for_checkout
...
This was changed into multiple lines for readability.
2019-05-06 18:37:28 +08:00
Kristina Lim
c0a5bcce92
Update some comments in Enterprise and OrderCycle models
2019-05-06 18:35:01 +08:00
Kristina Lim
781afc1015
Change OC :suppliers and :distributors to associations
2019-05-06 13:43:44 +10:00
Kristina Lim
71bff0dd5b
Reduce the number of queries in Enterprise.not_ready_for_checkout
2019-05-06 13:43:44 +10:00
Matt-Yorkley
dee9521f77
shipping_category now required for products
2019-05-05 12:00:46 +01:00
Michael Hughes
9e56198092
references to payment_enterprise_id removed, new migration created
2019-05-04 16:32:48 +01:00
Luis Ramos
4afa0cdca1
Merge pull request #3589 from kristinalim/fix/2788-ship_address_changed
...
2788 [Subscriptions] Fix address issues when syncing subscriptions and orders
2019-05-03 23:48:32 +01:00
luisramos0
4a9570b1a1
Merge branch '2-0-stable' into fix/2788-ship_address_changed
2019-05-02 16:17:53 +01:00
Luis Ramos
3b2e614c57
Merge pull request #3734 from luisramos0/2-0-validate-distribution
...
Removing a variant from OC will prevent user with that variant in the cart from checking out
2019-05-02 16:12:41 +01:00
Luis Ramos
edaf2479dc
Merge pull request #3741 from luisramos0/2-0-stable-Apr15
...
[Spree Upgrade] Merging master into 2-0-stable (1st run in Apr2019)
2019-05-02 11:26:54 +01:00
Kristina Lim
19726061e4
Make Order#address_from_distributor public
2019-05-01 07:17:50 +08:00
Kristina Lim
92dc43d7a2
Make OrderUpdater#shipping_address_from_distributor public
2019-05-01 07:16:56 +08:00
Kristina Lim
bdf4132e01
Fix order shipment references in OrderUpdater
2019-05-01 07:16:54 +08:00
luisramos0
3d420d5727
Merge branch 'master' into 2-0-stable-Apr15
2019-04-16 21:14:11 +01:00
Maikel Linke
8b9a814131
Remove obsolete Spree 2 backport on Order
2019-04-16 10:30:14 +10:00
Maikel Linke
6f12eee8ae
Reduce the override of Order for subscriptions
...
Orders belonging to subscriptions get completed without payment. That
requires overriding Spree's functionality.
In Spree 2, an order in payment state without pending orders is invalid.
Instead we skip the payment state by not requiring a payment for
automatically generated orders until the order cycle is closed.
2019-04-16 10:30:14 +10:00
luisramos0
59ec52babe
Refactor order_cycle_distributed_variants, better method names and simpler code
2019-04-11 22:15:24 +01:00
luisramos0
44b0592223
Move OrdercycleDistributedVariants from lib/open_food_network to app/services
2019-04-11 21:37:08 +01:00
luisramos0
96ee527f0c
Rename distribution_change_validator to order_cycle_distributed_variants
2019-04-11 21:14:01 +01:00
Luis Ramos
4478d51aee
Merge pull request #3668 from luisramos0/2-0-stable-Mar29
...
[Spree Upgrade] Merging master into 2-0-stable (4th run in Mar2019)
2019-04-09 17:46:36 +01:00
luisramos0
ecc60f3b61
Merge branch 'master' into 2-0-stable-Mar29
2019-04-05 15:47:46 +01:00
Pau Perez
aa3f0ac577
Reuse #superadmin? in Delayed Job Web route
...
This moves #superadmin? to the user decorator so it can be reused
outside FeatureFlags.
2019-04-04 16:00:27 +02:00
Pau Pérez Fabregat
c515a8f115
Merge pull request #3537 from Matt-Yorkley/pi/on_demand_error
...
Fix nil values in on_hand column
2019-04-03 11:56:06 +02:00
luisramos0
bc8bca074c
Switch object in the ability to access reports. This adapts to this change in Spree: 3685569db4
...
Adapt NavigationHelper to return the controller object for reports so that Reports tab works correctly.
2019-03-29 22:16:39 +00:00
