Matt-Yorkley
617d914835
Merge pull request #6788 from jibees/6783-align-new-product-form
...
Use full width for "new product" form
2021-02-02 13:11:12 +01:00
Matt-Yorkley
b1349306f9
Merge pull request #6787 from jibees/6784-align-items-on-shipping-and-payment-methods-forms
...
Align items on shipping and payment methods forms
2021-02-02 13:08:28 +01:00
Jean-Baptiste Bellet
370a108b3d
Add stripe account owner selector as a new row
...
Otherwise, not displayed.
2021-02-01 18:00:28 +01:00
Jean-Baptiste Bellet
acbe0faa1e
use full width for new product form
...
- use the sixteen full width: eight + eight or eight + four + four, ...
2021-02-01 16:35:55 +01:00
Jean-Baptiste Bellet
adf67475be
special aligment for stripe form
2021-02-01 15:39:51 +01:00
Jean-Baptiste Bellet
c44ce85f30
alignment for specific provider settings form in payment method
2021-02-01 15:31:39 +01:00
Jean-Baptiste Bellet
46e6bc6179
align payment method form
...
- enlarge the form to be "full size" (four + twelve = 16 columns)
2021-02-01 15:18:45 +01:00
Jean-Baptiste Bellet
e57acd3163
align shipping method form (editing)
...
- use `row` and no more `field` to be consistent
- enlarge the form to be "full size" (four + twelve = 16 columns)
- enlarge "hubs sidebar"
2021-02-01 15:11:47 +01:00
Jean-Baptiste Bellet
b7e23a7401
user "columns" system to display 3 items on same line
2021-02-01 14:15:50 +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
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
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
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
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
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
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
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
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
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
Jean-Baptiste Bellet
0242e1a0c9
avoid unnecessary javascript:void(0)
2021-01-27 10:26:05 +01: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
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
Luis Ramos
dd4ca8a8e6
Fix order path in subs emailer view
2021-01-25 19:52:48 +00:00
Luis Ramos
3813b80615
Adapt order path route in order details view
2021-01-25 19:52:48 +00:00
Luis Ramos
60c3557c2d
Fix checkout form order path
2021-01-25 19:52:48 +00:00
Luis Ramos
6e7ee02191
Change spree.order_path to spree_order_path everywhere
2021-01-25 19:52:48 +00:00
Jean-Baptiste Bellet
686dcaaa1b
remove '#' as path for link_to
...
Adding '#' to the current url makes most of browser jump to the top of the page. Avoid this by deleting this added # (meaningless) and replacing it by empty string.
2021-01-25 16:09:12 +01:00
Pau Perez
4a5869b60c
Remove ability to toggle mail delivery
...
OFN requires mails to work so there's no point in having this
conditional with the maintenance cost it entails.
2021-01-25 13:27:44 +01:00
Matt-Yorkley
0247386f82
Delete dead code Spree::Order#price_adjustments
...
This method returns the same thing as the Spree::Order#line_items_adjustments scope, but in a slightly less useful format (an array instead of a relation). The method's name is also totally inaccurate, as currently the only adjustments that appear on line items are tax adjustments for inclusive tax rates, which by definition have no effect on the price whatsoever...
2021-01-23 00:05:56 +00:00
Andy Brett
84689c43be
Merge pull request #6534 from andrewpbrett/sca-emails
...
Send email when SCA authorization is required for admin payment
2021-01-21 13:53:35 -08:00
Andy Brett
0e7f4b2f14
Merge pull request #6537 from mkllnk/simplify-mail-config
...
Simplify mail config
2021-01-21 10:59:43 -08:00
Andy Brett
70f30f5224
Merge pull request #6658 from andrewpbrett/item-counter-fix
...
Further fix #5989 (Item counter accepts values higher than the available stock)
2021-01-21 10:56:18 -08:00
Andy Brett
d9b27bc556
move controller and mailer outside of spree namespace; use haml in template
2021-01-21 09:18:29 -08:00
Andy Brett
802e49bed3
add PaymentMailer and send email if payment auth is required
2021-01-21 08:24:01 -08:00
Cillian O'Ruanaidh
40f9b063fe
Remove ability to create new product from products page, use /admin/products/new instead.
...
It's simpler if there is just one place to add a new product. Closes #6650
This removes the 'creating directly from the new product path' test scenario because we have another 'assigning important attributes' scenario above which provides enough coverage.
2021-01-21 08:24:01 -08:00
