Pau Pérez Fabregat
9db9d2d138
Merge pull request #6786 from jibees/6781-align-packages-selection-on-registration
...
Package selection: use "columns" system to display 3 items on same line
2021-02-01 21:06:00 +01:00
Jean-Baptiste Bellet
b7e23a7401
user "columns" system to display 3 items on same line
2021-02-01 14:15:50 +01:00
Matt-Yorkley
3da21ce2bd
Add historical note to CartService
...
Useful background when applying upstream fixes from Spree::OrderPopulator, and means grepping for OrderPopulator doesn't come up empty.
2021-01-30 16:57:05 +00:00
Matt-Yorkley
d39468013e
Clarify CartService#populate arguments
...
This method doesn't use :products anywhere, it doesn't need to be passed in as part of the argument.
2021-01-30 16:52:59 +00:00
Matt-Yorkley
b97734d918
Merge pull request #6720 from cillian/cancel-email-for-shop
...
When an order is cancelled by a customer send an email to the shop.
2021-01-29 18:30:28 +01:00
Cillian O'Ruanaidh
0cfd7de8a8
Fix the link to the order in the order cancelled email.
2021-01-29 14:14:11 +00:00
Matt-Yorkley
e4d7e03903
Merge pull request #6740 from Matt-Yorkley/carts-cleanup
...
Remove old abandoned carts
2021-01-29 12:32:16 +01:00
Cillian O'Ruanaidh
899dffec96
When an order is cancelled by a customer send an email to the shop.
...
Fixes #6435 i.e. If the customer paid for their order by Stripe/Paypal then the Enterprise needs to know that the order was cancelled in order to arrange a refund. Refunds are not automatically processed when an order is cancelled.
This will send a very basic email to the shop, it only includes a link to view the cancelled order in the admin area initially.
I created a CustomerOrderCancellation object here because orders can be cancelled in two ways (1) by the customer, so an email should be sent to the shop. (2) by the shop, so an email doesn't need to be sent. However the code for cancelling order happens in Order#cancel via the state machine. Rather than passing some sort of parameter into #cancel to indicate whether it is a customer or shop cancelled order it might be clearer to have a CustomerOrderCancellation object, there could be other differences between customer or shop cancelled orders in future maybe.
2021-01-29 11:23:05 +00:00
Pau Pérez Fabregat
818dfc0399
Merge pull request #6751 from jibees/4971-profile-tabs-back-forward-buttons
...
Make user's profile tabs aware of location change event
2021-01-29 10:01:58 +01:00
Matt-Yorkley
4f7c8062a1
Create class to map join table and simplify code
2021-01-28 21:51:50 +00:00
Pau Pérez Fabregat
45573dc522
Merge pull request #6753 from jibees/6746-epic-fullwdith-admin-layout-quick-wins
...
FullWidth admin layout quick wins
2021-01-28 21:10:06 +01:00
Pau Pérez Fabregat
0a1d4873e3
Merge pull request #6736 from jibees/6707-remove-anchor-jump
...
Remove anchor in URL so avoid browser scrolling to the top of the page when editing order
2021-01-28 21:09:08 +01:00
Matt-Yorkley
dcbe9c4011
Merge pull request #6756 from andrewpbrett/fix-sca-regression
...
Fix SCA regression
2021-01-28 19:45:08 +01:00
Pau Pérez Fabregat
2668747237
Merge pull request #6723 from luisramos0/spree_routes_2
...
Move spree orders routes out of the spree engine routes into the main app routes
2021-01-28 16:31:49 +01:00
Matt-Yorkley
57f429db58
Merge pull request #6606 from mkllnk/6081-add-to-cart
...
Add quantity input to shop front
2021-01-28 15:51:08 +01:00
Matt-Yorkley
de530c2a46
Merge pull request #6750 from mkllnk/6749-i18n-in-assets
...
Use JS I18n function in assets to avoid parsing error
2021-01-28 15:50:22 +01:00
Maikel
8a757812e7
Merge pull request #6735 from coopdevs/enable-mail-delivery-always
...
Enable mail delivery always
2021-01-28 09:31:12 +11:00
Matt-Yorkley
f49355e5d3
Merge pull request #6724 from Matt-Yorkley/remove-price-adjustments
...
Delete dead code Spree::Order#price_adjustments
2021-01-27 23:29:38 +01:00
Luis Ramos
12dac82b8a
Delete dead route
2021-01-27 22:08:06 +00:00
Luis Ramos
c604f4c0c6
Remove dead endpoint
2021-01-27 22:05:04 +00:00
Jean-Baptiste Bellet
bb21543ae0
remove useless brackets
2021-01-27 21:35:55 +01:00
Pau Pérez Fabregat
c3897dd3df
Merge pull request #6643 from coopdevs/customer-balance-frontoffice
...
Customer balance frontoffice
2021-01-27 19:55:56 +01:00
Andy Brett
e6e20309aa
Revert "don't try to process a payment if it's pending auth"
...
This reverts commit bba9e55006
2021-01-27 08:06:20 -08:00
Jean-Baptiste Bellet
9b1c0e6806
avoid inserting div in the columns grid system
...
it break the css selectors (as :first-child, ...)
fixe: #6747
2021-01-27 15:05:48 +01:00
Jean-Baptiste Bellet
c5edd74d05
remove useless wrapper and align items (both right and left)
...
Fixe: #6747
2021-01-27 15:04:45 +01:00
Jean-Baptiste Bellet
a6fba8a065
Put content into grid columns system
...
Two columns of three + a ten column rather than empty column + content outside column system
correct #6745
2021-01-27 14:40:50 +01:00
Matt-Yorkley
7525620d6c
Merge pull request #6070 from Matt-Yorkley/responsive-admin
...
Full-width admin layout
2021-01-27 12:45:06 +01:00
Matt-Yorkley
feca9e7838
Improve hubs sidebar in payment methods edit
2021-01-27 11:38:01 +00:00
Matt-Yorkley
398b4a09a1
Improve enterprise fees calculator fields
2021-01-27 11:38:01 +00:00
Matt-Yorkley
366588de95
Improve <legend> element centering
2021-01-27 11:38:01 +00:00
Matt-Yorkley
b5ab6cbf69
Improve button spacing in enterprises submenu
2021-01-27 11:38:01 +00:00
Matt-Yorkley
e762c1d02f
Adjust buttons layout on enterprise shipping and payment methods page
2021-01-27 11:38:01 +00:00
Matt-Yorkley
f72cd6222f
Adjust variant columns in inventory pages
2021-01-27 11:38:01 +00:00
Matt-Yorkley
539ff228e0
Adjust form layout on order cycle edit form (simple view)
2021-01-27 11:38:01 +00:00
Matt-Yorkley
afdb5e8c6f
Add a max-width of 1400px for huge monitors (1600px or more)
2021-01-27 11:38:01 +00:00
Matt-Yorkley
d40ec2d63c
Adjust order cycle edit form layout
2021-01-27 11:38:01 +00:00
Matt-Yorkley
0d99656b1b
Adjust dashboard layout
2021-01-27 11:38:01 +00:00
Matt-Yorkley
52cfa0a103
Remove old Javascript hacks for the main menu and replace with flex-based CSS properties
2021-01-27 11:38:01 +00:00
Matt-Yorkley
d886b1dcea
Tweak some styles and layout classes
2021-01-27 11:38:01 +00:00
Matt-Yorkley
29e74017a6
Replace fixed 960 grid
2021-01-27 11:38:01 +00:00
Pau Pérez Fabregat
9fe2cb1a30
Merge pull request #6681 from luisramos0/css
...
[Rails 5] Make the app work in rails 5
2021-01-27 12:08:27 +01:00
Jean-Baptiste Bellet
0242e1a0c9
avoid unnecessary javascript:void(0)
2021-01-27 10:26:05 +01:00
Jean-Baptiste Bellet
48c667d2dd
add onLocationChangeSuccess event handler
...
watch this event and toggle class if needed.
2021-01-27 10:25:05 +01:00
Maikel Linke
06983c4dc7
Use JS I18n function in asset, avoid parsing error
...
A deployment to the French server failed because a translation contained
an apostrophe `'` and we were rendering it without escaping in
Javascript. We don't have that problem and avoid other issues by using
the javascript translate function. That way the error message is
translated in the browser with the user's language and we don't have to
do any additional escaping.
2021-01-27 14:12:25 +11:00
Luis Ramos
34ae3ca24d
Replace spree_order_url with order_url so we can use scope in the routes file
2021-01-25 19:56:25 +00:00
Luis Ramos
f3da7afd55
Replace spree_order_path with order_path so we can use scope in the routes file
2021-01-25 19:55:42 +00:00
Luis Ramos
21f48b52c8
Fix cancel order route
2021-01-25 19:52:48 +00:00
Luis Ramos
592474189d
Fix order route in paypal controller
2021-01-25 19:52:48 +00:00
Luis Ramos
d52661fe0a
Fix admin order form to use admin orders route
2021-01-25 19:52:48 +00:00
Luis Ramos
00fcb89af1
Fix order_url routes in a few places
2021-01-25 19:52:48 +00:00
