Matt-Yorkley
110d1ef015
Ensure error code on failing tests
2021-03-28 17:33:55 +01:00
Konrad
b1507f7b2e
Updated Ruby version, added link to Debian guide and made requirements more clear.
2021-03-28 00:02:54 +01:00
Luis Ramos
e450fe95a1
Upgrade to ruby 2.5.8
2021-03-27 19:16:32 +00:00
Matt-Yorkley
28ee6a66a0
Update line item adjustments spec
...
The `adjustable` and `source` associations are basically the same now, and we'll be deleting the latter soon.
2021-03-27 18:59:50 +00:00
Matt-Yorkley
593764851f
Remove LineItemBasedAdjustmentHandling
2021-03-27 18:59:49 +00:00
Andy Brett
d92510db56
fix some easy rubocop offenses
2021-03-27 11:21:18 -07:00
Andy Brett
025f1f2725
add routing tests
2021-03-27 11:21:18 -07:00
Andy Brett
51d075166a
match any API version
2021-03-27 11:21:18 -07:00
Andy Brett
0b9c62284a
only match v0 immediately following api/ in the path
2021-03-27 11:21:18 -07:00
Andy Brett
ef38abed28
preserve GET params in url
2021-03-27 11:21:18 -07:00
Andy Brett
5a19a14042
rename to v0
2021-03-27 11:21:18 -07:00
Andy Brett
718a3be9f4
Merge pull request #7241 from luisramos0/more_rspec
...
[rails 5-2] More fixes to rspec syntax
2021-03-27 07:44:14 -07:00
Luis Ramos
f6f9159430
Fix rspec syntax
2021-03-26 23:45:12 +00:00
Luis Ramos
d66a78ecce
Add magic comment
2021-03-26 23:42:07 +00:00
Luis Ramos
3fe5f04fbc
Fix rspec syntax
2021-03-26 23:04:32 +00:00
Luis Ramos
30ca608fb9
Fix rspec syntax
2021-03-26 23:03:27 +00:00
Luis Ramos
8f7025b8c6
Fix rspec syntax
2021-03-26 23:01:23 +00:00
Luis Ramos
396c379f37
Fix rspec syntax
2021-03-26 22:50:48 +00:00
Luis Ramos
60ae3a8a4f
Fix rspec syntax
2021-03-26 22:37:54 +00:00
Luis Ramos
34771c89f9
Fix rspec syntax
2021-03-26 22:34:16 +00:00
Luis Ramos
f62f958a4c
Fix rspec syntax
2021-03-26 22:29:50 +00:00
Luis Ramos
ad3745f032
Fix rspec syntax
2021-03-26 22:19:16 +00:00
Matt-Yorkley
69cdb85291
Remove #with_unscoped_products_and_variants. Thanks @andrewpbrett :)
...
🔥
2021-03-26 19:08:17 +00:00
Matt-Yorkley
1b19d4bdee
Update default scopes with acts_as_paranoid
...
Fixes an issue where the LineItem :sorted_by_name_and_unit_value scope was not working with removal of the default scopes on line item and variant, which meant that the join in the scope was excluding soft-deleted items that should not have been excluded.
2021-03-26 18:22:05 +00:00
Andy Brett
d78517b6ed
Update app/views/spree/admin/orders/_add_product.html.haml
...
Co-authored-by: Maikel <maikel@email.org.au >
2021-03-26 09:34:12 -07:00
Andy Brett
19c2c9c1c5
Merge pull request #7175 from openfoodfoundation/7130-notify-on-payment-intent-error
...
Record invalid payment states for debugging
2021-03-26 08:33:07 -07:00
Matt-Yorkley
902265c678
Merge pull request #7235 from jibees/7220-import-ofn-font-into-admin
...
Fix font import from Darkswarm to admin
2021-03-26 15:27:07 +01:00
Matt-Yorkley
881e6dbac7
Add more explicit touch spec for Exchange -> Enterprise
2021-03-26 13:01:33 +00:00
Matt-Yorkley
45a06a300e
Update Exchange touch on Enterprise to use touch_later
...
This can improve issues with deadlocks where multiple touch calls are triggered in a single update, for example where an exchange touches it's parent enterprise on save, and we do this:
oc_with_lots_of_exchanges.exchanges.each{|ex| ex.clone! }
2021-03-26 12:44:50 +00:00
Jean-Baptiste Bellet
ee4beb57db
Do not import darkswarm file into admin, but only needed selector
2021-03-26 12:27:33 +01:00
Transifex-Openfoodnetwork
ad14a91eb2
Updating translations for config/locales/en_FR.yml
2021-03-26 22:00:33 +11:00
Transifex-Openfoodnetwork
09e0474069
Updating translations for config/locales/fr.yml
2021-03-26 21:57:16 +11:00
Transifex-Openfoodnetwork
59cf5aa3ec
Updating translations for config/locales/ru.yml
2021-03-26 21:31:08 +11:00
Jean-Baptiste Bellet
0ea085a275
Add unit prices for already bought product in cart page
2021-03-26 09:49:28 +01:00
Jean-Baptiste Bellet
2b93814fb1
Add context inside scope: used to specify display
...
- Context is used to customize some CSS specifications as sometimes display can be different (depending on the context)
- variant variable was not used: copy/paste error
2021-03-26 09:11:42 +01:00
Transifex-Openfoodnetwork
2e8178a33f
Updating translations for config/locales/es.yml
2021-03-26 18:42:11 +11:00
Transifex-Openfoodnetwork
96bb26ad45
Updating translations for config/locales/ca.yml
2021-03-26 18:37:20 +11:00
Maikel Linke
4c1f977d26
Return thread syncing to concurrency spec
...
Without syncing the two threads with a lock, the spec could accidentally
pass even if the code is broken. It was accidentally removed during
refactoring in b0fa1464f
2021-03-26 12:07:46 +11:00
Maikel Linke
cbd730f4eb
Remove left-over comment
...
This spec was fixed before and the comment was outdated.
2021-03-26 12:07:24 +11:00
Andy Brett
563a2758a6
remove UI for modifying line items on canceled orders
2021-03-25 16:52:56 -07:00
Transifex-Openfoodnetwork
bc191ab9bb
Updating translations for config/locales/de_DE.yml
2021-03-26 10:50:19 +11:00
Jean-Baptiste Bellet
2849f18313
Add some CSS specification to avoid page content up/down move
...
- Use `display: flex`
- Improve the display of the blue cross by a better alignement into the circle
2021-03-25 23:21:26 +01:00
Andy Brett
254f5e95af
Merge pull request #7219 from jibees/7216-fix-failing-specs-on-unit-price
...
Refactor unit price i18n keys
2021-03-25 13:26:14 -07:00
Andy Brett
5631c895b7
Merge pull request #7155 from jibees/7126-fix-links-to-customer-email
...
/admin/orders : fix incorrect value of the mail field in the mailto link
2021-03-25 12:55:24 -07:00
Andy Brett
691dd05028
Merge pull request #6956 from andrewpbrett/unit-price-backend
...
Provide actual unit price values in front end shop
2021-03-25 12:50:59 -07:00
Andy Brett
1d78a827ae
Merge pull request #7156 from jibees/5679-add-i18n-keys-for-distance_of_time_in_words_to_now-method
...
Add keys to handle some i18n issues
2021-03-25 12:43:09 -07:00
Andy Brett
2490861639
show correct values in line_item.rb
2021-03-25 12:26:02 -07:00
Transifex-Openfoodnetwork
8638509d01
Updating translations for config/locales/fr.yml
2021-03-26 06:20:25 +11:00
Transifex-Openfoodnetwork
76214e7733
Updating translations for config/locales/en_FR.yml
2021-03-26 06:17:27 +11:00
Transifex-Openfoodnetwork
aad9a69cfe
Updating translations for config/locales/fr.yml
2021-03-26 06:17:20 +11:00
