Pau Pérez Fabregat
92b05c76a3
Merge pull request #4068 from luisramos0/replace_oc_rabl
...
Convert order_cycle.rabl to Api::OrderCycleSerializer
2019-08-08 12:23:09 +02:00
luisramos0
be41271038
Make spelling coherent, as we have serializers with Z we get rid of the few serialisers with S we have
2019-07-29 19:57:12 +01:00
luisramos0
81482683cf
Extract method in subs controller
2019-07-17 12:08:51 +01:00
luisramos0
57f1742f24
Save subscription form on subs unpause so that proxy orders and orders are synced
2019-07-17 12:08:48 +01:00
Luis Ramos
23b6267e30
Merge pull request #3916 from luisramos0/schedules_of_coordinator
...
OC schedules are now filtered to schedules of OCs with same coordinator
2019-07-09 14:21:34 +01:00
luisramos0
e66dea7e03
Improve query in filter_schedules_by_enterprise_id. Makes join to OCs explicity.
2019-07-05 10:37:27 +01:00
luisramos0
8b0296eae6
Use a single query to get filter_schedules_by_enterprise_id
2019-06-26 11:38:03 +01:00
luisramos0
9c539da811
Fix rubocop issue in schedules_controller.collection by extracting method
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
Matt-Yorkley
563f9a4f5f
Remove another N+1
2019-05-29 12:28:56 +01:00
Matt-Yorkley
8733036fb0
Remove 2 N+1s, reduce queries in #visible action ~90%
2019-05-29 10:01:44 +01: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
340cbe5947
Eager load variants with variant overrides to avoid n+1 in the following line
2019-05-02 11:10:53 +01:00
luisramos0
a68b5eaf22
Fix bug in Variant Overrides controller. It was validating authorization for variant overrides of deleted variants
2019-04-17 15:31:19 +01:00
Pau Pérez Fabregat
87f0ddabe7
Merge pull request #3548 from luisramos0/2-0-remove-unused-new-v2-features
...
[Spree Upgrade] Remove unused spree v2 features
2019-03-22 10:35:15 +01:00
luisramos0
60ee17204b
Merge branch 'master' into 2-0-stable-Mar16
2019-03-16 16:17:38 +00:00
luisramos0
77655bfffb
Rename resource content to contents so that it matches the name of the controller ContentsController. This makes the is_active logic work on the configuration menu
...
See the menu is_active code here: f55722b38d/backend/app/helpers/spree/admin/navigation_helper.rb (L145)
2019-03-12 19:11:37 +00:00
Pau Perez
bbfd35c861
Fix CacheSettingsController violations
2019-03-06 10:45:45 +01:00
luisramos0
b325cea6cb
Merge branch 'master' into 2-0-stable-Mar6
2019-03-06 09:19:53 +00:00
Pau Pérez Fabregat
3ddee83be5
Merge pull request #3404 from luisramos0/2-0-disable-cache
...
[Spree Upgrade] Add checkbox to disable products cache
2019-03-05 14:51:11 +01:00
luisramos0
a0594f7616
Re-add invoice settings controller removed by mistake
2019-02-26 14:14:17 +00:00
luisramos0
0501db1782
Remove changes related to enterprise trials as they dont make sense without business models and account invoices
2019-02-25 14:37:16 +00:00
luisramos0
36e2786a1e
Delete Accounts and Billing dead feature code
2019-02-25 14:37:16 +00:00
Matt-Yorkley
f73221ed85
Use Dir::Tmpname.make_tmpname for threadsafe file naming
2019-02-20 13:10:47 +00:00
Matt-Yorkley
9705c249ac
Sanitize no-parsable BOM characters inserted by Excel
2019-02-18 13:13:37 +00:00
luisramos0
1b4666fc6a
Add checkbox to cache settings to disable products cache
2019-02-07 20:06:27 +00:00
Kristina Lim
b691d727a7
Move OFN::SubscriptionService to SubscriptionVariantsService
2019-01-26 02:03:55 +08:00
Kristina Lim
c23002102c
Add warning for unavailable subscription items
2019-01-26 02:03:55 +08:00
Kristina Lim
929290fc77
Reduce restrictions for creating subscriptions
...
Allow the following variants:
* Variants of permitted producers
* Variants of hub
* Variants that are in outgoing exchanges where the hub is receiver
2019-01-26 02:03:54 +08:00
Maikel
abe4f78e5c
Merge pull request #2988 from Matt-Yorkley/pi/utf8
...
Pi/utf8
2019-01-09 15:39:05 +11:00
Hugo Daniel
a50786be34
Remove old do_not_remove_referenced_fees method
2018-11-15 17:59:06 +01:00
Matt-Yorkley
9011f5d9a2
Rescue ArgumentError and give user feedback
2018-11-07 18:48:08 +00:00
Maikel
d63670d675
Merge pull request #2846 from Matt-Yorkley/pi/rename_enterprise_fields
...
[Product Import] Rename enterprise fields and update template
2018-10-30 15:11:02 +11:00
Matt-Yorkley
e7a909e828
Rename supplier to enterprise
2018-10-12 16:57:13 +01:00
niko
f65d3c2815
fix rubocop issue
2018-10-04 03:30:32 +02:00
niko
3ae38178a3
Move query from variant_overrides_controller to its model scope
2018-10-04 02:43:02 +02:00
Maikel
51f9a0afa1
Merge pull request #2562 from Matt-Yorkley/pi/product_attributes
...
[Product Import] Product attributes
2018-09-25 11:36:03 +10:00
Pau Pérez Fabregat
20077c99b5
Merge pull request #2618 from coopdevs/enable-style-send-cop
...
Favor #public_send over #send using Rubocop's cop
2018-09-20 19:03:40 +02:00
Matt-Yorkley
b57c6cf9ac
Add errors when attempting to update non-updatable fields
2018-09-19 21:12:29 +01: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
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
Pau Perez
b23cb55525
Fix current violations of Style/Send cop
2018-09-05 12:05:05 +02: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
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
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
Matt-Yorkley
c8397024e4
Streamline Product Import UX flow
2018-08-03 14:33:35 +10:00
Matt-Yorkley
c4af50e95c
Add sidebar to Import index page
2018-07-15 23:12:26 +01:00
