Cillian O'Ruanaidh
c40697cf61
If no enterprises have been geocoded yet make sure Open Street Map still displays correctly.
...
Before it would display a gray/blank div instead of map because the map latitude, longitude couldn't be calculated without geocoded enterprises. This adds a setting so the default coordinates can be set even if no geocoded enterprises present.
2020-06-26 15:45:58 +01:00
Luis Ramos
34207fc20f
Bring changes to stock_item from spree 2.1, the previous version was from spree 2.0.4
2020-06-24 16:16:58 +01:00
Luis Ramos
e12e50aa84
Move rubocop exception to rubocop todo
2020-06-24 16:16:58 +01:00
Kristina Lim
4694f1b21a
Require count on hand in non backorderable StockItem to be positive or zero
...
Fix setting of count on hand in line item specs
2020-06-24 16:16:45 +01:00
Kristina Lim
fb20f220c0
Use break instead of return in StockItem#process_backorders
...
We are not using the return value of this method anywhere.
2020-06-24 16:15:09 +01:00
Kristina Lim
0a1cb71ee4
Ignore Rails/UniqueValidationWithoutIndex for unique index of StockItem#stock_location
2020-06-24 16:15:09 +01:00
Kristina Lim
bc530b92b5
Address violation of Rubocop Rails/Validation:
2020-06-24 16:15:09 +01:00
Kristina Lim
2acf61fd0f
Address violation of Rubocop Rails/Delegate
2020-06-24 16:15:09 +01:00
Kristina Lim
1e8543dfe7
Address violation of Rubocop Rails/ReadWriteAttribute
2020-06-24 16:15:09 +01:00
Kristina Lim
22c0693beb
Address violation of Rubocop Style/NumericPredicate
2020-06-24 16:15:09 +01:00
Kristina Lim
d1725014c4
Auto-correct violationso of Rubocop Layout/*
2020-06-24 16:15:09 +01:00
Kristina Lim
0fd66f9a55
Auto-correct violationso of Rubocop Style/*
2020-06-24 16:15:09 +01:00
Kristina Lim
b783118700
Auto-correct violationso of Rubocop Style/RedundantSelf
2020-06-24 16:15:09 +01:00
Kristina Lim
0e711832fd
Bring Spree::StockItem code from spree_core into the app
2020-06-24 16:15:09 +01: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
Luis Ramos
cce26cb453
Merge branch '3-0-stable' into 3-0-stable-jun-2
2020-06-03 19:51:43 +01:00
Lucas Hiago
bfe17f54d7
Change minimal amount in price sack calculator to float
2020-06-03 08:51:41 -03:00
Luis Ramos
c9a7a6e897
Merge branch 'master' into 3-0-stable-jun-2
2020-06-02 16:00:45 +01:00
Luis Ramos
e7828e107b
Delete dead methods from product_decorator
2020-06-01 14:07:34 +01:00
Luis Ramos
c6842ada7f
Add variant_unit_name to the list of fields to be ignored when creating a variant, it's a product field
2020-06-01 13:41:15 +01:00
Cillian O'Ruanaidh
94b85fb9e3
Fix up Code Climate issues with Open Street Map code.
2020-05-31 18:42:55 +02:00
Cillian O'Ruanaidh
deafe32354
Add support for using Open Street Map on the Map and Group pages.
...
The map is displayed using https://leafletjs.com/
To enable Open Street Map go to the Admin -> Configuration -> Content section and click 'Open Street Map Enabled'.
The 'Open Street Map Provider Name' setting can be used to configure different tile providers thanks to the Leaflet-providers extension (https://github.com/leaflet-extras/leaflet-providers )
Some tile providers require an API key, this can provided in JSON format e.g. '{ apiKey: 123 }' in the 'Open Street Map Provider Options' setting.
Each tile provider has their own usage policy so this should be checked before enabling Open Street Map.
The search field for the Open Street Map works differently than searching on Google Maps. It matches producers by their name or address because it was easier to implement instead of matching place names all over the world.
2020-05-31 18:42:55 +02:00
