Luis Ramos
bdb40d68e9
Fix easy rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
b7255130b6
Bring Package from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
0ca8b6aab6
Fix easy rubocop issue
2020-07-02 21:24:14 +01:00
Luis Ramos
3e14c9777e
Merge decorator with class brought from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
d505fc2131
Bring availability validator from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
feadbb086f
Adapt spec to OFN context
2020-07-02 21:24:14 +01:00
Luis Ramos
b16db2f40e
Fix easy rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
8c3b8c4db5
Bring estimator from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
69b9cfbad2
Make packer use BasicSplitter by default
2020-07-02 21:24:14 +01:00
Luis Ramos
ccf928df12
Fix simple rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
e0f9894b7a
Bring packer from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
ec50a788a6
Fix easy rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
c2ec34ab9f
Bring coordinator from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
eb13595fd3
Fix simple rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
3ae2877d4e
Bring adjuster and prioritizer from spree_core
2020-07-02 21:24:14 +01:00
Luis Ramos
d18fec7125
Move Base splitter from main app models to order management engine services
2020-07-02 21:24:14 +01:00
Luis Ramos
735ee1e7ed
Fix simple rubocop issues
2020-07-02 21:24:14 +01:00
Luis Ramos
4fce506201
Bring splitter/base from spree
2020-07-02 21:24:14 +01:00
Pau Pérez Fabregat
66ddde1808
Merge pull request #5682 from Matt-Yorkley/in-digest-ion
...
Move default versions of Paperclip-managed images to /public
2020-07-01 18:02:15 +02:00
Cillian O'Ruanaidh
a9664e103d
Merge latest :master into :drop-blockenspiel branch and resolve conflicts related to Rubocop fixes.
2020-06-29 18:11:08 +01:00
Matt-Yorkley
ff8cb43717
Move default versions of Paperclip-managed images to /public
...
Image paths for these files are handled by Paperclip, which (with our current version) does not handle fingerprints on assets. Therefore we need to make these images available under /public
2020-06-27 08:45:59 +02:00
Luis Ramos
f004b3d573
Fix rubocop issue
2020-06-22 17:39:20 +01:00
Luis Ramos
b49eef5fa9
Fix rubocop issue
2020-06-22 17:39:20 +01:00
Luis Ramos
aa14fd236c
Fix rubocop issue
2020-06-22 17:39:20 +01:00
Luis Ramos
ff68303ef6
Fix long lines
2020-06-22 17:39:20 +01:00
Luis Ramos
0f2e07cc2d
Fix long lines
2020-06-22 17:39:20 +01:00
Luis Ramos
0e3b5ad4c3
Revert rubocop auto correct because update! is a method in the adjustment model
2020-06-22 17:39:17 +01:00
Luis Ramos
41ff406e86
Fix rubocop issue by avoiding rails method name update_attributes
2020-06-22 16:51:46 +01:00
Luis Ramos
b879439d58
Use rubocop auto correct to fix Style/SafeNavigation issue
2020-06-22 16:51:46 +01:00
Luis Ramos
f848a89a00
Rename update_attributes to update #rails4
2020-06-22 16:51:43 +01:00
Luis Ramos
adfe1f89b6
Revert previous rubocop auto correct fix that breaks the cart spec
2020-06-22 13:08:38 +01:00
Luis Ramos
8a9dae0ee2
Run rubocop autocorrect
...
This is the result of bundle exec rubocop --auto-correct
2020-06-22 12:23:10 +01:00
Pau Pérez Fabregat
db80992326
Merge branch 'master' into drop-blockenspiel
2020-06-19 12:12:10 +02:00
Luis Ramos
06a37d8ff0
Merge pull request #5566 from rioug/5132-no-error-when-product-csv-malformed
...
Add handling of CSV::MalformedCSVError for product_importer
2020-06-17 19:58:35 +01:00
François Turbelin
6672cfdaf5
Readd price_adustments after bad rebase
2020-06-16 16:13:56 +02:00
François Turbelin
9abe41f6cb
Use OrderTaxAdjustmentsFetcher service
2020-06-16 14:01:27 +02:00
François Turbelin
c729f64fcf
Include adjustments without positive taxes
2020-06-16 14:01:27 +02:00
Pau Perez
456f369b76
Fix outstanding Rubocop violations
2020-06-15 10:17:34 +02:00
Cillian O'Ruanaidh
430e5ea9cc
Permission to view :bulk_coop report is now added in the #add_bulk_coop_abilities method.
2020-06-13 16:57:43 +01:00
Cillian O'Ruanaidh
c1e57fcc12
Adjust CanCan ability to reflect that the bulk coop report now runs from the order management engine.
2020-06-13 15:41:09 +01:00
Luis Ramos
983bed3c4e
Merge branch 'master' into 3-0-stable-jun-2
2020-06-11 19:50:56 +01:00
Pau Pérez Fabregat
bc8a10c6a0
Merge pull request #5541 from luisramos0/has_variants
...
Delete dead code related to products without variants
2020-06-11 15:18:13 +02:00
Pau Pérez Fabregat
246a4995cb
Merge pull request #5490 from luchiago/change-price-sack-amount-int-to-float
...
Change minimal amount in price sack calculator to float
2020-06-11 12:42:11 +02:00
Gaetan Riou
d3943bc92a
refactor error handling of CSV::MalformedCSVError and fix some typos
2020-06-11 16:47:58 +10:00
Luis Ramos
28f126eed1
Merge pull request #5545 from mbudm/task/matomo-tag-manager
...
Add configuration to enable Matomo Tag Manager
2020-06-10 20:49:34 +01:00
Luis Ramos
113533e3b1
Merge pull request #5557 from Matt-Yorkley/reports-improvement
...
Improve performance in various reports
2020-06-10 18:54:51 +01:00
Steve Roberts
5fcc0dcd14
Add configuration to enable matomo tag manager
...
- Update embed codes and allow both scripts concurrently
- Add lines around blocks
- Update MTM copy based on PR feedback
- checked cookies unchanged
2020-06-09 10:21:11 +10:00
Luis Ramos
88896b7730
Merge branch 'master' into 3-0-stable-jun-2
2020-06-08 19:17:11 +01:00
Gaetan Riou
9b8a97aadd
Add handling of CSV::MalformedCSVError for product_importer
2020-06-08 16:21:02 +10:00
Matt-Yorkley
9e278d5b2f
Improve performance in various reports
2020-06-05 16:39:01 +02:00
