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
Luis Ramos
658c77f3f5
Merge pull request #5701 from Matt-Yorkley/noimage
...
Noimage
2020-07-02 20:17:04 +01:00
Luis Ramos
510449547f
Merge pull request #5644 from coopdevs/manage-font-with-asset-pipeline
...
Manage OFN's font through the asset pipeline
2020-07-02 20:09:08 +01:00
Matt-Yorkley
8fc407a9d5
Extract repeated variant thumbnail code to a shared partial
2020-07-02 18:36:43 +02:00
Matt-Yorkley
eeb6c57f99
Update missing image paths in other order views
2020-07-02 18:36:27 +02:00
Matt-Yorkley
4e08d2049f
Ensure a valid locale is persisted during login
...
This action has to be performed here and not in I18nHelper, as spree_current_user is not initialized yet during the other checks / setting the selected locale value in the app
2020-07-02 15:33:19 +02:00
Matt-Yorkley
91880cdbec
Make I18nHelper #available_locale? method public
2020-07-02 14:35:59 +02:00
Matt-Yorkley
d70d61439a
Always return an available locale
2020-07-02 14:35:59 +02:00
Matt-Yorkley
aa6f4d4fb9
Don't set unavailable locales on the current user
2020-07-02 14:35:59 +02:00
Matt-Yorkley
8dfaea629b
Refactor current_user_locale to a new method
2020-07-02 14:35:59 +02:00
Pau Pérez Fabregat
4ced16c206
Merge pull request #5709 from luisramos0/empty
...
Replace empty? with blank? and replace unless empty? with if present?
2020-07-02 11:36:37 +02:00
Matt-Yorkley
26c511d47e
Remove taxon icons
...
These icons are inconsistently used across instances and have already been removed in a few places in the app in the mobile UX redesign.
2020-07-02 11:25:17 +02:00
Luis Ramos
7dcc2bb27c
Merge pull request #5703 from Matt-Yorkley/checkout-addresses
...
Checkout addresses
2020-07-01 19:06:29 +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
Pau Pérez Fabregat
28376b1056
Merge pull request #5561 from coopdevs/defend-from-invoice-without-bill-address
...
Do not print the bill addr. name when there's none
2020-07-01 17:50:09 +02:00
Luis Ramos
2d4326ded3
Replace empty? with blank? which is equivalent but a bit more resilient, returns false for nil
...
Present is not blank, so unless blank? becomes if present?
2020-07-01 14:08:07 +01:00
Luis Ramos
2179cc7faf
Make StripeSCA void action make a refund instead
...
StripeSCA does not support voiding confirmed payment intents so we need to make a refund instead
2020-07-01 13:10:56 +01:00
Luis Ramos
63934b7863
Add space after translation so that translators dont have to guess a space is needed after the translation
2020-07-01 11:56:37 +01:00
Pau Perez
8c371fd0d1
Do not print bill addr. in invoice2 either
2020-07-01 11:27:57 +02:00
Matt-Yorkley
87cd936c94
Blacklist timestamp attributes when assigning for update
...
Doing #clone or #dup of an object's attributes then passing it to an #update/#update_attributes call means we are manually passing values for created_at and updated_at, which can cause problems, especially if the object being duped hasn't been persisted yet: in this case we would be manually attempting to save timestamps with nil values, which is not a good idea. Here they are blacklisted from the attributes hash.
2020-06-30 11:30:16 +02:00
Matt-Yorkley
ce8908f53b
Use #dup when copying attributes hash
...
In Rails 4, #clone behaves differently. The attributes hash of the cloned object is shared with the original, it's not a separate object! https://github.com/rails/rails/blob/4-0-stable/activerecord/lib/active_record/core.rb#L217-L220
2020-06-30 11:30:16 +02:00
Pau Perez
0c93de8298
Manage OFN's font through the asset pipeline
2020-06-30 09:02:36 +02:00
Pau Perez
23178763b0
Do not print the bill addr. name when there's none
...
The error
```
ActionView::Template::Error: undefined method `full_name' for nil:NilClass
```
happens a few times a day and raises exceptions we don't pay attention to.
They add unnecessary noise that hides other more relevant issues.
This, however, is a symptom of a deeper data integrity problem that needs
solving at some point. This is just a countermeasure.
2020-06-30 08:46:01 +02:00
Luis Ramos
de8b97b2e1
Merge pull request #5526 from cillian/drop-blockenspiel
...
Drop blockenspiel
2020-06-29 20:09:26 +01:00
Matt-Yorkley
be0131b94c
Merge pull request #5645 from coopdevs/fix-scss-deprecation-warning
...
Rename *.css.scss to *.scss
2020-06-29 20:36:42 +02:00
Matt-Yorkley
bd0e4c75c4
Merge pull request #5636 from fatihorhan/make-user-guide-links-consistent
...
Update Sell page to use User Guide links from configuration
2020-06-29 20:33:00 +02:00
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
