Matt-Yorkley
0ba670b180
Ensure order is cleanly reset to cart state when redirecting to cart
2020-11-27 11:42:46 +00:00
Matt-Yorkley
2fa2a30c67
Add spec coverage, refactor, avoid double-render errors
...
👍
2020-11-22 18:37:31 +00:00
Matt-Yorkley
cabec7e73f
Fix Rubocop warnings and tidy up
2020-11-22 18:02:54 +00:00
Matt-Yorkley
87df44764f
Extract stock-check logic to controller concern and inject prior to final Paypal payment confirmation.
2020-11-22 18:02:52 +00:00
Matt-Yorkley
010c1c799d
Add some notes on paypal checkout flow
2020-11-18 14:55:29 +00:00
Matt-Yorkley
2faea65f82
Bring in Spree::PaypalController#confirm method
...
Original method from the gem. This handles the post-payment response from paypal.
2020-11-18 14:51:23 +00:00
Matt-Yorkley
dd8f139c1b
Memoize Spree::PaypalController#payment_method
...
This gets called 4 or 5 times in a single request just to read basic attributes from the object. The query doesn't need to be repeated each time
2020-11-18 13:45:14 +00:00
Matt-Yorkley
6d0d4b5096
Bring in Spree::PaypalController#payment_method
...
Original method from the gem. Modified in preceding commit.
2020-11-18 13:45:13 +00:00
Matt-Yorkley
3b92df42c3
Fix the menu!
...
🙈
2020-11-16 19:05:08 +00:00
Pau Pérez Fabregat
6db80e837b
Merge pull request #6361 from andrewpbrett/fix-gateway-error-error
...
move gateway_error require to lib/spree/core.rb
2020-11-13 13:15:13 +01:00
Matt-Yorkley
cec295a113
Merge pull request #6373 from andrewpbrett/fix-admin-users
...
specify Spree routes for pagination, fix 500 on admin/users
2020-11-13 11:30:16 +01:00
Maikel
d96216b8d7
Merge pull request #6268 from yihyang/master-yy-added-product-sorting
...
Sort products alphabetically in OC edit/create page
2020-11-13 13:29:54 +11:00
Maikel
d4ff9055c0
Merge pull request #6351 from efgalvao/issue#6249
...
Fixes Issue#6249
2020-11-13 13:28:55 +11:00
Maikel
591ba34eb6
Merge pull request #6335 from cillian/reset-on-demand-on-inventory-import
...
When resetting stock to 0 on absent products in inventory import also reset the on demand setting
2020-11-13 13:28:17 +11:00
Andy Brett
8dfd3f624d
paginate zones using spree routes as well
2020-11-12 14:24:04 -08:00
Andy Brett
9cf30b431a
specify Spree routes for pagination
2020-11-12 14:09:59 -08:00
Pau Pérez Fabregat
777cedd90d
Merge pull request #6305 from efgalvao/issue#6292
...
Fixed issue #6292 .
2020-11-12 17:42:42 +01:00
Pau Pérez Fabregat
7c4691ab33
Merge pull request #6339 from andrewpbrett/fix-instance-unit-picker
...
Fix #6304 (Product edit: Cannot change Variant unit scale of an existing product)
2020-11-12 16:15:00 +01:00
Andy Brett
17202ff39c
move gateway_error require to lib/spree/core.rb
2020-11-10 14:55:56 -08:00
Pau Perez
634ab5ca6a
Don't scale logo image
...
The trick using `width: 100%` and a set `max-width` doesn't work if we
can't know the image width as it can be uploaded by superadmins. There's
no need though because the media query breakpoint triggers just before that.
2020-11-10 09:51:41 +01:00
efgalvao
307b1ca9f9
Fixes Issue#6249
2020-11-09 14:06:37 -03:00
Pau Perez
1903c575ff
Reorder properties alphabetically
...
As Hound demands.
2020-11-09 15:40:25 +01:00
Pau Perez
9a885173b9
Remove element from class selector
...
Fixes Hound error `Avoid qualifying class selectors with an element.`.
2020-11-09 15:39:09 +01:00
Andy Brett
99301e1fb2
fix #6304
2020-11-06 12:49:07 -08:00
Pau Perez
b5f27d48df
Fix .top-bar-section not to wrap the icons-menu
...
This line-wrap makes the icons-menu overlap the OC selector. The menu's
background is transparent, what makes it look even more broken.
The fix involves refactoring the `.top-bar-section` into using flexbox
instead of this highly coupled CSS and floats. With flexbox it becomes
as easy as telling the browser to space the three sections evenly
filling-up the window, while scaling down the logo if there's not enough
room.
The root cause is that every instance uses a custom logo, which wasn't
the one we used while designing and implementing. This is why using
fixed-sizes in pixels won't work.
2020-11-06 17:35:24 +01:00
Cillian O'Ruanaidh
89d63dfbb9
When resetting stock to 0 on absent products in inventory import also reset the on demand setting
...
Before when you imported inventory and clicked the 'Set stock to zero for all existing products not present in the file' option it would set the on hand stock to 0 but if the variant override was also set to be on demand the inventory would still be available for sale. This change makes sure the on demand setting is turned off too.
Fixes #6289 .
2020-11-06 14:57:31 +00:00
Matt-Yorkley
db3576f469
Merge pull request #6308 from luisramos0/translations
...
Fix some missing translations in orders edit page
2020-11-05 18:33:51 +01:00
Matt-Yorkley
c2362921fa
Merge pull request #6272 from tsara27/fix-alignment-order
...
Align center order adjustment and order total title
2020-11-05 18:33:08 +01:00
Matt-Yorkley
0668dd2591
Merge pull request #6307 from efgalvao/issue#6262
...
Fixes issue #6262 .
2020-11-05 18:31:49 +01:00
Matt-Yorkley
bc96ad9515
Merge pull request #6299 from Matt-Yorkley/admin-image-edit
...
Fix display issue in product image edit page
2020-11-05 18:28:10 +01:00
Luis Ramos
0ae3bf985a
Fix some missing translations in orders edit page
2020-11-04 21:54:27 +00:00
efgalvao
5260c01f16
Update registration.html.haml
...
Removed spaces.
2020-11-04 17:37:11 -03:00
efgalvao
42d5f377e0
Fixes issue #6262 .
2020-11-04 13:11:37 -03:00
Luis Ramos
5cde085241
Fix a number of spree translations
2020-11-04 13:55:36 +00:00
Luis Ramos
23956726e9
Add missing translation
2020-11-04 12:37:55 +00:00
efgalvao
1f1da3eb6d
Fixed issue #6292 .
2020-11-04 09:37:51 -03:00
Luis Ramos
f6d0905517
Add s3_support require to image.rb
2020-11-04 12:15:45 +00:00
Luis Ramos
eada388534
Add handle_extensions to get Spree.translations (archaic spree js translations) in handlebars templates
...
This is all legacy from spree that can be cleaned up at some point, we only have two handlebars templates in OFN
2020-11-04 12:15:45 +00:00
Luis Ramos
c785d0d1d7
Make engine's routes append to main app instead of prepend
2020-11-04 12:15:45 +00:00
Luis Ramos
80cbe6b30f
Add route helper to call to sort_link so that it can find the necessary routes
2020-11-04 12:15:45 +00:00
Luis Ramos
09aef524f3
Make route helpers use spree helper
2020-11-04 12:15:45 +00:00
Luis Ramos
805b4d243e
Fix missing translations
2020-11-04 12:15:45 +00:00
Luis Ramos
a07029f660
Add require so that model is available when needed
2020-11-04 12:15:45 +00:00
Luis Ramos
ab53db0c61
Merge ability and ability decorator
2020-11-04 12:15:45 +00:00
Luis Ramos
1b4a4a8113
Bring code from spree_paypal_express to make it use spree url_helper
2020-11-04 12:15:45 +00:00
Luis Ramos
79a7cf9b39
Add default spree logo
2020-11-04 12:15:45 +00:00
Luis Ramos
a18a198812
Fix locations of requires in admin js all.js
2020-11-04 12:15:45 +00:00
Luis Ramos
b7aa04353c
Fix requires of product duplicator
2020-11-04 12:15:45 +00:00
Luis Ramos
9bbeec5031
Require code from spree/core explicitly
2020-11-04 12:15:45 +00:00
Luis Ramos
af3057f55f
Remove spree requires that are not needed in OFN
2020-11-04 12:15:45 +00:00
