14886 Commits

Author	SHA1	Message	Date
Matt-Yorkley	e290c128bf	Fix error in Api::ShipmentController#update with :unlock parameter ... This is a generic issue caused by a clash between state machines trying to define (or failing to define) the #open method on adjustments as part of their state changes interface. This method is already defined in Object. For more details, see: bb42e33bf7/lib/state_machines/machine.rb (L323-L350)	2021-04-30 14:13:22 +01:00
Matt-Yorkley	b843b871f6	Ensure order totals and payment/shipment states are correct when changing shipping method on a completed order. ... This used to happen via an after_save callback in Shipment, which called `order.update!`. That has recently been removed. After changing a shipment's selected shipping rate (shipping method), we need to ensure the order's totals and states are updated. We don't need to update all of the order's adjustments though (see previous commit). FYI Spree handled this issue like this: 24388485ed, but there are lots of things about that commit that are clearly awful, like: params handling in a model, duplication of Order::Updater logic across the codebase, the Shipment class having responsiblity for knowing which things need to be updated on the order, etc. The result is ultimately the same as what we're doing here though.	2021-04-30 12:57:01 +01:00
Matt-Yorkley	045ce73c83	Simplify shipment controller params	2021-04-30 12:20:47 +01:00
Pau Pérez Fabregat	057bcddee9	Merge pull request #7478 from jibees/7458-get-products-on-order-cycle-change-events ... Get the whole list of products on order cycle changes	2021-04-30 11:39:15 +02:00
Andy Brett	f64d5a9f59	Merge pull request #7438 from jibees/7353-fix-OC-display-issue-text-on-two-lines ... Change the position of order_cycle component into a shop front	2021-04-29 14:05:06 -07:00
Andy Brett	c069a23926	Merge pull request #7476 from cillian/admin-stripe-elements-width ... Increase the width of Stripe Elements fields in admin so they don't overlap	2021-04-29 14:04:44 -07:00
Andy Brett	8ba139c6fb	Merge pull request #6825 from julesemmac/6584-map-location-confirm ... 6584 map location confirm	2021-04-29 14:04:06 -07:00
Andy Brett	699f1c4f41	Merge pull request #7497 from andrewpbrett/fix-double-stripe-payments ... Use capture! if payment is already authorized	2021-04-29 08:35:19 -07:00
Matt-Yorkley	2f49d089ea	Use Time.zone.now	2021-04-29 08:56:17 +01:00
Matt-Yorkley	290c1d0ebf	Bring in shipment state updating from Spree 2.2	2021-04-28 21:43:28 +01:00
Guido Oliveira	84285ff985	prevent deleting only item in confirmed order	2021-04-28 17:37:28 -03:00
Andy Brett	73e5fd3f5b	use method to clarify intent on payment intents	2021-04-28 10:43:06 -07:00
Andy Brett	9906afa1a6	use capture! if payment is already authorized	2021-04-27 17:59:03 -07:00
Matt-Yorkley	1d29e277f2	Merge pull request #7493 from Matt-Yorkley/order-states-bug-redux ... Reload order before updating in Payment callback	2021-04-27 17:43:34 +02:00
Matt-Yorkley	22f79fe540	Reload order before updating in Payment callback	2021-04-27 14:27:35 +01:00
Matt-Yorkley	574d78403d	Merge pull request #7433 from coopdevs/raise-on-failed-customer-creation ... Notify Bugsnag if customer fails to be created	2021-04-27 12:42:39 +02:00
Jean-Baptiste Bellet	07881ede2d	Do not trigger loadMore method immediatly ... - This avoid to request unwanted resources, ie. the next 10 products of a shop	2021-04-27 11:24:48 +02:00
Jean-Baptiste Bellet	cdbcbf4214	Reinitialize page params when changing order cycle	2021-04-27 11:24:48 +02:00
Jean-Baptiste Bellet	523b957ba7	Initialize activeTaxons and activeProperties ... - so there is no unwanted changes (from `undefined` to `[]`) that would trigger a loadProducts request	2021-04-27 11:24:48 +02:00
Jean-Baptiste Bellet	71466e643f	Instanciate only one ProductsCtrl ... - instead of 2: therefore, for each shop display, we only request products one time instead of two times.	2021-04-27 11:24:48 +02:00
Pau Perez	ee01b0162c	Write if as a one-liner and avoid extra queries	2021-04-26 12:39:03 +02:00
Pau Perez	c65d82be01	Notify Bugsnag if customer fails to be created ... This will hopefully let us see in Bugsnag when #6038 happens and so we'll have all the diagnostics data. The fact that the `order.distributor` is optional but mandatory to create the customer already gives us some clue.	2021-04-26 10:15:12 +02:00
Andy Brett	6153f1c1b4	Merge pull request #7471 from Matt-Yorkley/dead-scopes ... Order scopes	2021-04-25 11:51:00 -07:00
Andy Brett	6f20a23d47	Merge pull request #7436 from coopdevs/remove-duplicate-method ... Replace duplicate #unauthorized method with module inclusion	2021-04-25 11:26:12 -07:00
Luis Ramos	f357c3ff30	Remove require_dependency or use require ... See here https://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html#require-dependency	2021-04-23 19:20:25 +01:00
Cillian O'Ruanaidh	8cdc4bc3f4	Increase the width of Stripe Elements fields in admin so they don't overlap ... The card number and expiry month/year fields were overlapping on the new payment form in the admin area.	2021-04-23 17:54:22 +01:00
Pau Perez	e5eb68dffc	Replace duplicate method with module inclusion ... No reason to risk diverging their implementations. They are exact copies. Likewise, there's no need to have to I18n keys with almost the same content.	2021-04-23 12:03:11 +02:00
Matt-Yorkley	4938285dd7	Move order query methods to chainable scopes	2021-04-23 10:29:48 +01:00
Matt-Yorkley	caee2eb3e9	Remove dead code in order ... These aren't used anywhere	2021-04-23 10:23:40 +01:00
Cillian O'Ruanaidh	af3eb82343	Merge in upstream changes from julesemmac:6584-map-location-confirm and resolve conflicts	2021-04-22 22:34:02 +01:00
Cillian O'Ruanaidh	1e96f92df2	Fix the toggle address confirmed checkbox so the latitude/longitude gets set ... Before when you checked and unchecked the checkbox it was toggling the :isConfirmed variable.	2021-04-22 22:16:47 +01:00
Cillian O'Ruanaidh	12704af143	Use after_action calls for geocoding instead of old update.after, create.after calls	2021-04-22 22:13:28 +01:00
Cillian O'Ruanaidh	c41476423b	Merge latest master into julesemmac/6584-map-location-confirm and resolve conflict in api/enterprises_controller.rb	2021-04-22 19:43:49 +01:00
Pau Pérez Fabregat	cf2e3db645	Merge pull request #7445 from jibees/7403-add-customer-name-into-subscriptions-table ... Add customer name into subscriptions list in order to search subscription by customer name	2021-04-22 19:46:49 +02:00
Pau Pérez Fabregat	c1da97527a	Merge pull request #7420 from Matt-Yorkley/adjustments-controller ... Adjustments controller index	2021-04-22 19:15:28 +02:00
Matt-Yorkley	123e96eb1e	Merge pull request #7284 from jibees/styleguide ... Implements our StyleGuide	2021-04-22 18:14:40 +02:00
Matt-Yorkley	bef3f8c51f	Merge pull request #7452 from Matt-Yorkley/adjustments-permissions ... Update CanCan permissions on adjustments	2021-04-22 18:07:18 +02:00
Jean-Baptiste Bellet	9a670c7821	Print order needs render_with_wicked_pdf ... and call WickedPdf::PdfHelper explicitly	2021-04-22 15:18:27 +02:00
Jean-Baptiste Bellet	de592de13a	Use the first view component DistributorTitleComponent for a shopfront	2021-04-22 15:08:54 +02:00
Jean-Baptiste Bellet	4781d6cc84	Add new (and first) component: DistributorTitle ... - Simple wrapper around `<h3 />` for distributor title, used in the shop front	2021-04-22 15:08:54 +02:00
Jean-Baptiste Bellet	57e5214217	Call WickedPdf::PdfHelper#render_to_string_with_wicked_pdf explicitly	2021-04-22 15:08:54 +02:00
Jean-Baptiste Bellet	6c37461c37	Create very first component ... - With command: `rails generate component Example title --sidecar` - Delete generated spec file	2021-04-22 15:08:54 +02:00
Jean-Baptiste Bellet	259e758d6e	When suppress_error_msg is present do no validate order and redirect ... - When creating a new order, it's not necessary to display the "Line items can't be blank" as the order has just been created and the user is rightly doing configuration about line items	2021-04-22 10:03:36 +02:00
Matt-Yorkley	6dc23804a1	Merge pull request #7425 from mkllnk/application-record ... Add ApplicationRecord for customisations of models	2021-04-21 23:18:03 +02:00
Matt-Yorkley	ecd433b343	Update permissions on adjustments ... The previous permissions assumed that an adjustment's "adjustable" could only be only line items or orders, and that's no longer true. It's now commonly a shipment or a payment as well.	2021-04-21 18:17:20 +01:00
Andy Brett	479897fcbd	Merge pull request #7315 from Matt-Yorkley/double-checkout ... Double checkout	2021-04-20 10:44:32 -07:00
Andy Brett	883cc6f96f	Merge pull request #7428 from jibees/7426-show-unit-price-in-the-bulk-modal ... Show unit price in the bulk buy modal	2021-04-20 10:43:28 -07:00
Jean-Baptiste Bellet	ddb63dff8a	Add name of the customers into subscriptions table ... - Thus, we can filter subscriptions by customer email	2021-04-20 16:09:48 +02:00
Jean-Baptiste Bellet	5e712fa4c0	Add variable for the zIndex of the navigation header	2021-04-20 13:50:39 +02:00
Jean-Baptiste Bellet	6dbe91b199	Positions the order_cycle according to shop-tabs ... - Move from `enterprises/shop.html.haml` to `shopping_shared/_tabs.html.haml` to handle its position correctly - Remove marginTop and height to order cycle component and display it relative to parent's bottom (ie. the columns in `tab-buttons`) - Adjust z-index to display the entire component	2021-04-20 13:50:33 +02:00