Luis Ramos
3a20de1465
Merge pull request #5398 from cillian/open-street-map
...
Add support for using Open Street Map on the Map and Group pages.
2020-06-04 17:01:25 +01:00
Luis Ramos
12000d2d44
Merge pull request #5425 from luisramos0/pay_method_warning
...
Add warning to payment method edit page
2020-06-03 21:03:56 +01:00
Pau Pérez Fabregat
d9cf22fed5
Merge pull request #5528 from luisramos0/checkout_js
...
Make checkout JS code send bugsnag alert even if there's an error processing an error
2020-06-03 09:13:40 +02:00
Pau Pérez Fabregat
fb339d6a99
Merge pull request #5263 from luisramos0/pdp
...
[Mobile] Restyle product modal
2020-06-03 08:55:20 +02:00
Luis Ramos
89c461662f
Merge pull request #5502 from Matt-Yorkley/dropshadow-regression
...
[mobile ux] Fix missing drop-shadow
2020-06-02 12:07:37 +01:00
Matt-Yorkley
8e57f9d929
Adjust shared map partial
2020-05-31 19:21:20 +02: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
Luis Ramos
6e842212ea
Always throw back error even if there is an error loading the flash for example translating the error message
2020-05-29 14:45:22 +01:00
Matt-Yorkley
c73defa8a1
Merge pull request #5494 from Matt-Yorkley/group-maps-fix
...
Fix group maps
2020-05-29 12:05:55 +02:00
Pau Pérez Fabregat
c0ad992352
Merge pull request #5465 from luisramos0/rename_accessible_by
...
[Rails 4.1] Rename order_cycle.accessible_by to remove name clash with active record
2020-05-29 12:04:19 +02:00
Luis Ramos
bb8401a0fc
Merge pull request #5444 from luisramos0/dead_js_code
...
Remove some dead JS code related to admin sub menus
2020-05-28 19:54:42 +01:00
Luis Ramos
bec798c6c9
Bring some spree translations to ofn in payment methods pages
2020-05-28 19:51:23 +01:00
Luis Ramos
fe6bcb5093
Add de-activation warning to payment methods edit page
2020-05-28 19:50:58 +01:00
Luis Ramos
26f1dfb080
Move payment_method display field translations to OFN and adapt them to changes on same field in shipping method
2020-05-28 19:50:58 +01:00
Luis Ramos
83edfbd1dd
Merge pull request #5266 from luchiago/improve-order-cancellation-email
...
Improve order cancellation email
2020-05-28 19:48:26 +01:00
Luis Ramos
6f0106251e
Move product-img css class to parent div so we can center align it and keep existing img styling
2020-05-27 19:16:31 +01:00
Pau Pérez Fabregat
127e48e579
Merge pull request #5413 from luisramos0/edit_orders_mobile
...
Show order edit link on mobile instead of the cancel link
2020-05-27 08:51:41 +02:00
Pau Pérez Fabregat
4d3ae8fa53
Merge pull request #5439 from coopdevs/fix-misplaced-paragraph
...
[mobile ux] Fix misplaced paragraph in shop tab
2020-05-27 08:51:13 +02:00
Luis Ramos
7313e3c096
Merge pull request #5501 from luisramos0/grumpy_cat_take_2
...
Enterprises Controller: reset_distributor must be called before any call to memoized current_distributor
2020-05-26 23:06:59 +01:00
Matt-Yorkley
953e1f8ff4
Adjust z-index on overlapping elements to fix missing drop-shadow regression
2020-05-26 12:59:51 +02:00
Luis Ramos
4026e072d5
Break OrderCartReset in two steps so that memoized method current_customer (that uses memoized current_distributor) is called after reset_distributor
2020-05-26 11:13:16 +01:00
Luis Ramos
513ee6393a
Make product modal display image on the right for medium screens like it was doing for large screens
2020-05-25 19:31:02 +01:00
Luis Ramos
1e0e3a063d
Add margin right to product modal title so that the close button doesnt overlap with it
2020-05-25 19:14:40 +01:00
Matt-Yorkley
8095371304
Ensure OpenStreetMap credits are aways shown with map and fix credits positioning for /groups page map display
2020-05-25 14:12:12 +02:00
Matt-Yorkley
a3660dfe37
Extract repeated map code to new partial
2020-05-25 14:04:11 +02:00
Matt-Yorkley
e03005ed56
Fix maps and tidy up groups map code
2020-05-25 13:52:56 +02:00
Luis Ramos
cb0aefd29c
Make display on attribute available for managers to change, not just super admins
2020-05-25 11:21:53 +01:00
Pau Pérez Fabregat
da88399ca6
Merge pull request #5411 from Matt-Yorkley/orders-closed-fullwidth
...
Fix closed shop message not displaying full-width
2020-05-22 19:32:08 +02:00
Pau Pérez Fabregat
a5b4c5316c
Merge pull request #5458 from Matt-Yorkley/oc-form-ui-bug
...
Fix display issue on order cycle edit form
2020-05-22 19:31:41 +02:00
Pau Pérez Fabregat
f1dbad1007
Merge pull request #5466 from Matt-Yorkley/shop-search-fix
...
Fix search bar in /shops and /groups
2020-05-22 18:40:27 +02:00
Pau Pérez Fabregat
17e77df14f
Merge pull request #5451 from Matt-Yorkley/oc-selector-fix
...
Fix tab-buttons element overlapping order cycle selector
2020-05-22 18:39:10 +02:00
Pau Pérez Fabregat
3f593d6246
Merge pull request #5440 from luisramos0/grumpy_cat
...
Fix Grumpy Cat on shop page (cart with items from a closed OC)
2020-05-22 18:38:41 +02:00
Luis Ramos
9a71ffc093
Merge pull request #5438 from Matt-Yorkley/cart-stock-ux
...
Cart stock UX
2020-05-22 14:21:16 +01:00
Pau Perez
be9fbae300
Fix misplaced paragraph in shop tab
...
By wrapping message within 12-cols container, keeping consistency with
the other shop tabs.
2020-05-22 12:37:07 +02:00
Luis Ramos
b7c601abcd
Merge pull request #5424 from luisramos0/ship_method_warning
...
Add warning to enterprise Shipping Method list and to Shipping method edit page
2020-05-22 11:24:12 +01:00
Luis Ramos
2ae34d8df3
Merge pull request #5355 from jeduardo824/enhancement/make-shop-names-links-on-transactions-page
...
change shop name to be link to shop on transactions page
2020-05-21 10:56:19 +01:00
Luis Ramos
a6ea79d3a5
Add warning message to enterprise ship methods list and ship method edit page
2020-05-21 10:47:22 +01:00
Luis Ramos
cf0ad179a1
Move hubs_sidebar to the last 4 columns at the top of the page
2020-05-21 10:45:58 +01:00
Maikel
da55956a6e
Merge pull request #5392 from luisramos0/ship_method_bo
...
Make "backoffice only" ship methods work and remove option "frontoffice only"
2020-05-21 10:16:15 +10:00
Luis Ramos
76b721b663
Merge pull request #5457 from Matt-Yorkley/cart-fix
...
Fix cart fields sharing same scope
2020-05-19 19:31:49 +01:00
Matt-Yorkley
3df2d4721b
Fix search bar in /shops and /groups
2020-05-19 14:00:20 +02:00
Luis Ramos
758d7c82f7
Rename order_cycle.accessible_by to remove name clash with active record
2020-05-19 12:21:13 +01:00
Matt-Yorkley
4a837e8c07
Fix display issue on order cycle form
...
Some of the form elements on the first OC edit page were covered up by the save bar in some cases. this ensures they are always visible and clickable.
2020-05-19 11:56:41 +02:00
Matt-Yorkley
05e6f5792d
Fix cart fields sharing same scope
...
All cart page quantity fields were displaying a single max quantity instead of a different value for each one.
2020-05-19 10:23:12 +02:00
Lucas Hiago
ba30f55e70
Add fullwidth for table selector
2020-05-18 22:53:46 -03:00
Matt-Yorkley
e3c337ef7e
Fix mixed error display issue
2020-05-18 16:41:57 +02:00
Matt-Yorkley
d70174becc
Use fresh scope for each quantity field
2020-05-18 16:28:07 +02:00
Matt-Yorkley
f9f76f9082
Move reused available stock logic to service
2020-05-18 16:19:49 +02:00
Matt-Yorkley
111e700799
Update invalid input feedback
2020-05-18 16:14:14 +02:00
