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
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
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
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
Matt-Yorkley
5b3fd25a78
Update all locales with the latest Transifex translations
2021-03-25 19:01:50 +00:00
Matt-Yorkley
cdd052d39f
Merge pull request #7218 from openfoodfoundation/transifex
...
Transifex
2021-03-25 19:57:49 +01:00
Jean-Baptiste Bellet
5c93ccc0e3
Refactor unit price i18n keys
...
- Now got two keys: `js.admin.unit_price_tooltip` and `js.shopfront.unit_price_tooltip`
2021-03-25 17:59:20 +01:00
Transifex-Openfoodnetwork
93501743b6
Updating translations for config/locales/ar.yml
2021-03-26 03:48:04 +11:00
Matt-Yorkley
0f5af2d9f1
Merge pull request #6927 from Matt-Yorkley/adjustments-payment-fee
...
[Adjustments] Payment fee adjustment
2021-03-25 17:40:53 +01:00
Andy Brett
b68476cdcb
Merge pull request #7212 from coopdevs/remove-n+1-on-admin-customers
...
Fix multiple N+1s on /admin/customers.json
2021-03-25 09:29:43 -07:00
Andy Brett
be60adbcb3
update class name to singular in spec
2021-03-25 08:51:16 -07:00
Andy Brett
907c0d3e8c
rename unit_price.rb file
2021-03-25 08:51:15 -07:00
Andy Brett
d2828585eb
fix typo in spec
2021-03-25 08:51:15 -07:00
Andy Brett
6ebf45610d
use instance_double in specs
2021-03-25 08:51:15 -07:00
Andy Brett
7319ef7345
use better method and class names
2021-03-25 08:51:15 -07:00
Andy Brett
330839012e
add translation
2021-03-25 08:51:15 -07:00
Andy Brett
89c7342892
memoize UnitPrices object
2021-03-25 08:51:15 -07:00
Andy Brett
0afc2d281a
shorten UnitPrices method names
2021-03-25 08:51:15 -07:00
Andy Brett
39fc0707c3
provide unit price values in front end shop
2021-03-25 08:51:15 -07:00
Matt-Yorkley
cbd7c9f4c0
Update adjustments controller collection scope
2021-03-25 15:02:02 +00:00
