Matt-Yorkley
b441ac2644
Update paths to "noimage" images
2020-06-29 20:07:08 +02:00
Matt-Yorkley
5bec887f93
Move /assets/images/noimage/* to /public/noimage/*
2020-06-29 19:58:38 +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
Pau Perez
c892f9c69b
Make button border radius consistent
2020-06-29 12:01:59 +02: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
Cillian O'Ruanaidh
1199a356c4
Extract out a JS service for calculating where to centre the map when given a set of coordinates.
...
Also removing the hardcoded default latitude/longitude from open_street_map directive because it's probably not very likely that it will be needed.
2020-06-26 22:26:39 +01:00
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
2ad2836ac6
Merge pull request #5563 from luchiago/fix-missing-closed-oc-info-i18n
...
add missing i18n key for closed OC
2020-06-25 20:33:55 +01:00
Luis Ramos
93a2e57bc6
Merge pull request #5538 from jeduardo824/bug/4592-payment-methods-table-in-dashboard
...
Fix Payment Methods table to show proper provider name
2020-06-25 20:32:04 +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
Steve Roberts
8b79d41b81
Update orders swagger spec and fix api_key access to orders endpoint
2020-06-24 13:21:49 +10: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
0ba1642bd2
Fix rubocop issues
2020-06-22 17:39:20 +01:00
Luis Ramos
aa14fd236c
Fix rubocop issue
2020-06-22 17:39:20 +01:00
Luis Ramos
ab59ab45f5
Use auto correct to fix rubocop issues
2020-06-22 17:39:20 +01:00
Luis Ramos
f54abbd376
Fix rubocop issues
2020-06-22 17:39:20 +01:00
Luis Ramos
730959f85f
Fix rubocop issue
2020-06-22 17:39:20 +01:00
Luis Ramos
8870dc4b06
Move rubocop exception to code
2020-06-22 17:39:20 +01:00
Luis Ramos
ed5fc29c44
Fix hash alignment 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
1b6e51c79e
Fix rubocop 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
8a61257547
Rename all before_filter to before_action, it's the same function with a new name
2020-06-22 13:11:57 +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
3b91dd9dea
Use rubocop auto-correct to fix more issues
2020-06-22 12:51:47 +01:00
Luis Ramos
5d710f1e24
Use ruboccop autocorrect to fix issues
2020-06-22 12:46:07 +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 Perez
f36e08a163
Rename *.css.scss to *.scss
...
This fixes the following deprecation warning
```
DEPRECATION WARNING: Extra .css in SCSS file is unnecessary. Rename /usr/src/app/app/assets/stylesheets/darkswarm/variables.css.scss to /usr/src/app/app/assets/stylesheets/darkswar
m/variables.scss. (called from _app_views_layouts_darkswarm_html_haml___3990351141569700945_46957256630860 at /usr/src/app/app/views/layouts/darkswarm.html.haml:18)
(...)
```
2020-06-19 16:29:08 +02:00
Matt-Yorkley
cda5a042b3
Ensure cart page table is full-width
2020-06-19 12:56:47 +02:00
Pau Pérez Fabregat
db80992326
Merge branch 'master' into drop-blockenspiel
2020-06-19 12:12:10 +02:00
Matt-Yorkley
444097c75f
Merge pull request #5559 from luisramos0/display_only_shop
...
Make display only shops work again
2020-06-19 11:12:55 +02:00
Matt-Yorkley
b189d06eb7
Update shopping CTA logic
...
Shows "Take me shopping!" button on /shops page if a shop is selected
2020-06-19 08:59:43 +02:00
Eduardo
573f7b1087
make shop links on the producers page open in new tab
2020-06-18 19:55:06 -03:00
