Pau Pérez Fabregat
0f627cdf39
Merge pull request #2661 from kristinalim/translations-copy_of_order_cycle
...
Translate "COPY OF" when cloning an OC
2018-09-17 12:38:29 +02:00
Maikel
e836ac0234
Merge pull request #2686 from HugsDaniel/2593_customize_user_guide_link
...
Enable setting a customized user guide link in general settings
2018-09-14 15:46:05 +10:00
Maikel
beedd933e9
Merge pull request #2512 from kristinalim/feature-remove_enterprise_images
...
Support removal of enterprise logo and promo image
2018-09-14 15:07:24 +10:00
Hugo Daniel
8dd0e01b8e
Use explicit syntax for section objects in preference_sections definition
2018-09-13 12:34:06 +02:00
Maikel Linke
a447fe4f40
Require lib file where needed
...
We can't always rely on other parts of the code been loaded first. We
need to declare dependencies so that they are always present.
I just ran into this problem in my dev environment.
2018-09-13 12:01:16 +10:00
Hugo Daniel
cc43d789e2
Refacto edit method for content controller and enable custom user guide link
2018-09-12 14:51:53 +02:00
Kristina Lim
2c2dd62f6a
Translate "COPY OF" when cloning an OC
2018-09-08 02:06:52 +08:00
Maikel
3e0c74494d
Merge pull request #2604 from Matt-Yorkley/pi/updating_variants_bug
...
Pi/updating variants bug
2018-09-07 15:10:18 +10:00
Kristina Lim
9c3bb863da
Add endpoints for removing enterprise images
2018-09-04 01:32:39 +08:00
Matt-Yorkley
4dfbbd60d4
Fix occasional StaleObjectError on variant updates
2018-08-31 19:47:08 +01:00
Matt-Yorkley
75a9ea5bfa
Prefer .flat_map(&foo) over .map(&foo).flatten
2018-08-31 15:38:38 +01:00
luisramos0
1b4e0cd73a
Made the menu config default values more user friendly
2018-08-31 11:23:11 +10:00
luisramos0
e573a3fc2b
The main menu is now translatable and configurable using Content configuration and translations. Added 7 menu entries to the translations file (each with text and url) and 7 content configuration points to enable/disable these. The mobile menu icons can also be configured.
2018-08-31 11:23:11 +10:00
Matt-Yorkley
6b9b8d8b73
Match multiple product names
2018-08-28 03:26:17 +01:00
Maikel
8eee8f96ed
Merge pull request #2557 from Matt-Yorkley/pi/class_descriptions
...
Class descriptions for Product Import
2018-08-24 18:14:12 +10:00
Matt-Yorkley
717f626dfe
Refactor enterprise validation
2018-08-24 15:51:37 +10:00
Matt-Yorkley
2b057a26d5
Add primary_producer to index to reduce queries
2018-08-24 15:51:37 +10:00
Matt-Yorkley
666fbf53bf
Validate enterprise.is_primary_producer?
2018-08-24 15:51:37 +10:00
Maikel
a37931afda
Merge pull request #2542 from luisramos0/add_to_cart
...
Extract OrderController.populate to new CartController and OrderPopulator to new CartService
2018-08-24 14:43:33 +10:00
Maikel
bf55190136
Merge pull request #2546 from Matt-Yorkley/pi/sku_validation
...
Remove empty SKU values if empty
2018-08-24 14:32:00 +10:00
luisramos0
05bfc098ff
/controllers/spree/order_populator_decorator (with a class_eval) is now /services/CartService with no dependency to Spree::OrderPopulator.
2018-08-23 12:39:55 +01:00
Maikel
4417a8f156
Merge pull request #2539 from luisramos0/delete_dead_cart
...
removed Cart route, controller, model and specs: dead code
2018-08-22 17:35:58 +10:00
Matt-Yorkley
fbbbc93aba
Class descriptions for Product Import
2018-08-18 11:42:02 +01:00
Matt-Yorkley
28b1fc076a
Remove empty SKU values if empty
2018-08-16 14:29:50 +01:00
luisramos0
91e57cb893
Removed Cart table, its dependency on spree orders table and removed some more dead code related to this
2018-08-15 23:29:28 +01:00
luisramos0
4b64369ddb
Added GA and Matomo toggle in Legal Settings in the global settings in the BO and added GA and Matomo cookies details to the cookies policy page (according to what is configured in the BO)
2018-08-14 10:01:48 +10:00
luisramos0
ca35c59e52
Moved the footer TOS URL from the content settings to the new section legal settings in the global settings
2018-08-14 10:01:48 +10:00
luisramos0
d920c32376
Added cookies banner toggle and privacy URL to a new section called Legal Settings in the global settings in the BO
2018-08-14 10:01:48 +10:00
luisramos0
0b9061df28
removed Cart route, controller, model and specs: dead code
2018-08-11 22:17:12 +01:00
luisramos0
3b1bd53d3a
Added basic integration with Matomo
...
Added matomo script and added a new matomo settings menu entry under configuration. Improved organization of en.yml by grouping configuration screens.
2018-08-10 16:12:58 +10:00
Maikel Linke
27ddb712c1
Remove unused scope Spree::Variant.in_stock
...
Our added scope is not used anywhere and conflicts with the Spree
upgrade.
https://github.com/openfoodfoundation/openfoodnetwork/issues/2014
2018-08-09 14:22:43 +10:00
Matt-Yorkley
c8397024e4
Streamline Product Import UX flow
2018-08-03 14:33:35 +10:00
Matt-Yorkley
67767f86eb
Change import and reset logic to work with first page
2018-07-23 02:07:00 +01:00
Matt-Yorkley
bd200c885b
Move options to first page
2018-07-23 01:46:32 +01:00
Pau Pérez Fabregat
7bf27ec6b3
Merge pull request #2409 from mkllnk/2013-remove-scope-active_distributors
...
2013 Remove dead code for Spree upgrade
2018-07-18 10:38:19 +02:00
Rob Harrington
4863f2b5b4
Remove unrequired credit_card_id field from subscriptions table
2018-07-05 19:26:12 +10:00
Rob Harrington
21c3f7d21c
Remove unrequired #cards and #addresses actions from Admin::CustomerController
2018-07-05 19:26:12 +10:00
Rob Harrington
cf8ca1f8c1
Add show action to Admin::CustomersController
2018-07-05 19:26:11 +10:00
Rob Harrington
fc2844a3d5
Add default_card method to user model
2018-07-05 19:26:11 +10:00
Frank West
09534b41e9
Remove taxon when primary taxon is changed
...
We are adding taxons to the product as you change the primary taxon.
However we never remove the previous primary taxon so it forces the user
to update the taxons manually. This can be a big problem if you are bulk
updating products.
We now remove the taxon that matches the previously set primary taxon.
2018-07-04 09:16:50 +10:00
Rob Harrington
82e3016a26
Add comment to StripeGateway wrapper methods indicating that they are named by Spree
2018-07-03 14:21:58 +10:00
Rob Harrington
c496d0f14d
Allow credit owed on payments made via stripe to be refunded via the admin section
2018-07-03 14:21:58 +10:00
Maikel Linke
306bfa1944
Remove unused method enterprise method
...
`Enterprise.has_supplied_products_on_hand?` is not used anywhere.
2018-06-27 11:25:44 +10:00
Maikel Linke
792701297b
Remove unused scope Enterprise.active_distributors
...
Working on the Spree upgrade, we found that this scope is using the soon
obsolete column `spree_products.count_on_hand`. Trying to measure the
impact of changing this scope, I couldn't find any use of it.
There is a variable called `active_distributors` used when serialising
enterprises, but that variable is initialised with
`Enterprise.distributors_with_active_order_cycles.ready_for_checkout`,
not using the `active_distributors` scope.
See also:
https://github.com/openfoodfoundation/openfoodnetwork/issues/2013
2018-06-27 11:12:54 +10:00
Rob Harrington
ddb9ae1140
Load all shops that a user is associated with as a customer
...
Regardless of the presence of an order
2018-06-24 16:28:47 +10:00
Rob Harrington
6e76fd8164
Add Api::CustomersController with update action
2018-06-22 15:39:46 +10:00
Matt-Yorkley
d9623176fb
Include admin users as managers on new enterprises
2018-06-21 13:21:08 +10:00
Frank West
8324b00999
Renames product bulk edit action to index
...
When a user hit cancel while editing a product it took them to the spree
products index page instead of the bulk edit page. The button was part
of a shared view for all resources so changing it's actions were not
readily available.
It was suggested that instead of carrying our own separate controller
action we could just override the index action of the products
controller with the bulk edit functionality instead. This has the
advantage of removing some overrides and allows us to not add
additional overrides in the future.
2018-06-19 17:51:23 +10:00
Pau Perez
78e59d059a
Show product import's UI only to superadmins
...
We still need to iterate on its implementation and it's too early to
make it publicly available.
2018-06-11 19:50:53 +02:00
Rob Harrington
6a202d9446
Use more descriptive name for after_save callback method: :ensure_single_default_card
2018-06-08 15:30:08 +10:00
