4827 Commits

Author	SHA1	Message	Date
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
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	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
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
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	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
Jean-Baptiste Bellet	de592de13a	Use the first view component DistributorTitleComponent for a shopfront	2021-04-22 15:08:54 +02: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	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
Jean-Baptiste Bellet	e0987c52ed	Add unit price information into the bulk buy modal ... - Pass a parameter to scope: showunitprice and display unit price information if it's true	2021-04-16 11:09:05 +02:00
Matt-Yorkley	50da77c6db	Hide tax rate selection when editing non-admin adjustments	2021-04-15 13:59:05 +01:00
Luis Ramos	2c05478b2f	Adapt routes and helpers to make view spec green	2021-04-13 16:54:32 -07:00
Luis Ramos	049c2b59ca	Adapt routes and helpers to make view spec green	2021-04-13 16:54:32 -07:00
Matt-Yorkley	acb593c2f1	Ensure Shipping Methods can be created with no tax category ... The option to apply *no* tax category should be present in this dropdown.	2021-04-13 16:40:49 +01:00
Andy Brett	d00970e05d	Merge pull request #7207 from andrewpbrett/fix-nil-price-subs ... Report subscription failures	2021-04-09 12:13:11 -07:00
Andy Brett	67d49b7486	Merge pull request #7342 from luisramos0/dead_code ... [Rails 5.2] Delete dead code in variants list page, this is old spree logic	2021-04-08 10:47:02 -07:00
Andy Brett	b78ed85ad3	Merge pull request #7321 from Matt-Yorkley/remove-bugherd ... Remove Bugherd	2021-04-08 10:35:17 -07:00
Matt-Yorkley	e61fe86d00	Merge pull request #7300 from andrewpbrett/on-demand-max-quantities ... Allow any quantity if variant is set to on demand	2021-04-08 12:33:19 +02:00
Matt-Yorkley	034f452f4f	Merge pull request #7313 from jibees/7301-fix-line-breaks-on-cart-page ... Add non-breaking space to avoid unwanted line breaks on unit price	2021-04-08 12:31:45 +02:00
Luis Ramos	ec6bb7f9fe	Delete dead code, this is old spree logic	2021-04-07 22:55:06 +01:00
Matt-Yorkley	1ce3103aa7	Merge pull request #6924 from Matt-Yorkley/adjustments-shipping-tax ... [Adjustments] Shipping tax	2021-04-07 00:21:12 +02:00
Matt-Yorkley	4a65e5817f	Add fieldset title to shipping methods edit form	2021-04-06 20:30:07 +01:00
Matt-Yorkley	01e6397e27	Remove Spree::Config[:shipment_inc_vat] ... This is now done per ShippingMethod instead of globally	2021-04-06 20:29:58 +01:00
Andy Brett	2c17d12f6e	Merge pull request #7303 from drummer83/independent-update-cart-label ... Independent 'update cart' label	2021-04-06 10:59:06 -07:00
Andy Brett	2aeed30775	Merge pull request #7265 from andrewpbrett/freeze-adjustments ... Don't allow edits to adjustments for canceled orders	2021-04-06 10:56:27 -07:00
Matt-Yorkley	03c36dfd7f	Remove Bugherd ... 🔥	2021-04-05 13:31:13 +01:00
Matt-Yorkley	903788903b	Remove Spree::Config[:shipping_tax_rate]	2021-04-04 19:19:06 +01:00
Matt-Yorkley	8fccdbf92f	Introduce TaxCategories to ShippingMethods	2021-04-04 19:19:06 +01:00
Andy Brett	f2e238d0ea	refactor view logic to helper	2021-04-03 13:33:09 -07:00
Andy Brett	c0cbd1e688	remove new adjustment button for canceled orders	2021-04-02 12:26:59 -07:00
Jean-Baptiste Bellet	6756ffcf42	Add non-breaking space to avoid unwanted line breaks	2021-04-02 16:59:50 +02:00
Jean-Baptiste Bellet	608a28316c	Specify right for attribute for <label /> element ... - So, `<label />` is rightly linked to its `<input />`	2021-04-02 15:22:01 +02:00
Jean-Baptiste Bellet	76fbb2be84	Use custom input text (instead of :price one) ... - Use `variant_unit_price` for `id` attribute and `variant[unit_price]` for `name` attribute - Previously, there was an duplicated `#id` on the page because we used `:price`	2021-04-02 15:22:01 +02:00
Konrad	7c47102869	Use new independent label for 'update cart' ... orders_form_update_cart	2021-04-01 23:30:00 +02:00
Andy Brett	4efcd8457c	Merge pull request #7227 from jibees/7215-fix-page-content-up/down-move-when-opening-the-unit-price-tooltip ... Add some CSS specification to avoid page content up/down move	2021-04-01 07:21:13 -07:00
Andy Brett	7312341fc4	Merge pull request #7233 from jibees/7224-add-unit-price-to-previously-orders-in-the-cart-page ... Add unit price for already bought products in cart page	2021-04-01 07:19:36 -07:00
Andy Brett	9f0f88de4e	allow any quantity if variant is set to on demand	2021-03-31 22:02:32 -07:00
Matt-Yorkley	3f14694b2b	Merge pull request #6960 from andrewpbrett/namespace-api ... Namespace existing API endpoints to api/v0/*	2021-03-30 19:45:27 +02:00
Maikel Linke	0980b81742	Raise errors in specs with missing translations ... The previous mechanism didn't seem to work and newer Rails versions have an easier config for this now. Also fixing all i18n errors which were now failing specs.	2021-03-30 17:08:17 +11:00
Andy Brett	9d2fd373ce	record subscription issue if no order is generated	2021-03-29 14:53:13 -07:00
Andy Brett	32c0f6777a	don't allow edits to adjustments for canceled orders	2021-03-29 14:27:46 -07:00
Andy Brett	5a19a14042	rename to v0	2021-03-27 11:21:18 -07: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
Jean-Baptiste Bellet	0ea085a275	Add unit prices for already bought product in cart page	2021-03-26 09:49:28 +01:00
Andy Brett	563a2758a6	remove UI for modifying line items on canceled orders	2021-03-25 16:52:56 -07:00
Jean-Baptiste Bellet	2849f18313	Add some CSS specification to avoid page content up/down move ... - Use `display: flex` - Improve the display of the blue cross by a better alignement into the circle	2021-03-25 23:21:26 +01:00