Filipe
cb540d66c6
Merge pull request #9084 from jibees/9046-property-filter-on-shopfront
...
Fix an issue which prevented filtering by properties and sorting by category on a shopfront.
2022-04-22 11:03:31 +01:00
GeorgeThoppil
898c470c00
Change enterprise visibility scope
2022-04-21 20:27:28 -04:00
Filipe
2ddc64ce4d
Merge pull request #9072 from mkllnk/remove-taxon-icons
...
Remove unused icons from Spree::Taxon
2022-04-21 11:46:57 +01:00
Jean-Baptiste Bellet
3e5656e638
Remove distinct to make proper ORDER BY
...
Update specs as well to test match array and test duplication by adding property2 to product1
2022-04-21 11:03:22 +02:00
Filipe
f516b7056d
Merge pull request #8863 from georgethoppil/payment-state-cancel-subscription-order
...
Setting payment state for subscription order
2022-04-20 13:14:57 +01:00
Filipe
f831154b6f
Merge pull request #8950 from jibees/5903-delete-coordinators_fees-linked-to-cloned-OC
...
Delete linked coordinators fees when deleting an order cycle
2022-04-18 11:55:53 +01:00
Maikel Linke
2e989083bd
Remove unused icons from Spree:Taxon
...
The icons are not used any more and the default icon file never existed
in our code base (only in Spree when we depended on that).
And it's better to remove this clutter before migrating those files to
Active Storage.
We are keeping the icon files in storage as a backup. The whole folder
`/spree/taxons` can be deleted when desired. But storage is cheap.
2022-04-15 16:50:28 +10:00
Nihal Mohammed
15e7a5a4df
Rename product_stock_display to product_low_stock_display
...
Rename product_stock_display to product_low_stock_display in enterprise_serializer and shop_variant_controller
2022-04-15 10:59:42 +10:00
Nihal M. Kelanthodika
f7a767988c
Add preferred_product_stock_display to Enterprise model, serializer and permitted attributes. (Fixed alignment of guest orders radio button as well)
2022-04-15 10:53:28 +10:00
GeorgeThoppil
8aa4631e21
Setting payment state for subscription order
2022-04-13 19:08:51 -04:00
Maikel
a4bffc61f1
Merge pull request #8997 from apricot12/8968-Group-products-by-supplier-P1
...
Sort products by supplier in invoice
2022-04-13 11:54:12 +10:00
Nihal Mohammed
b2613f3331
Add translations
2022-03-28 18:26:39 +05:30
Nihal Mohammed
5f2f5456a0
Add code to sort order by supplier when Enterprise user chooses to
2022-03-28 18:12:39 +05:30
Matt-Yorkley
ad5c834342
Merge pull request #8995 from apricot12/7853-deprecation-warnings-1
...
7853 deprecation warnings 1
2022-03-25 19:54:06 +00:00
Nihal Mohammed
992cb9d920
Add invoice_order_by_supplier attribute to enterprise
2022-03-21 20:29:19 +05:30
Nihal Mohammed
ad52805a0d
Change errors to be accessed by a block with single paramter instead of hash
2022-03-15 05:35:22 +05:30
jibees
d4a4a36b14
Merge pull request #8766 from jibees/8477-cancel-order-and-send-confirmation-email-on-last-item-deletion
...
Edit order: on last item deletion, cancel the order and conditionally send cancellation email to consumer
2022-03-11 08:56:41 +01:00
Filipe
6ce29f81d8
Merge pull request #8920 from apricot12/Remove_checkout_only_option_from_payment_methods_display
...
Remove checkout only option from payment methods edit form.
2022-03-10 14:38:45 +00:00
Nihal Mohammed
e2bdc69a90
Update available_payment_methods method in enterprises_helper and order model
2022-03-07 17:33:09 +05:30
Nihal Mohammed
3820d4c591
Removed checkout only from DISPLAY options on payment method edit form and updated payment_method_spec
2022-03-07 17:33:09 +05:30
Jean-Baptiste Bellet
771f7b0393
Delete coordinators_fees linked to an order_cycle when it is destroyed
2022-03-02 11:00:04 +01:00
Maikel Linke
b999673dfc
Remove old version of relaxed styled guide
...
We had an old version under "contested settings" and it looks like some
of them were modified. I hope that our new, separate file will
discourage manual tweaks.
We can include the relaxed rules from a gem as well. Let's see if we
need that complexity one day.
2022-02-25 10:51:54 +11:00
Maikel Linke
1d15f35522
Remove now unnecessary inline rubocop config
2022-02-25 10:46:51 +11:00
Filipe
385cd49964
Merge pull request #8876 from SarvarKh/product-import-validation
...
Fix product import on existing, empty unit_type and variant_unit
2022-02-21 23:20:04 +00:00
Filipe
dbf5eb76f8
Merge pull request #8689 from apricot12/Transaction_fee_when_crediting
...
Revoke transaction fee if there is an amount to be credited in order
2022-02-21 20:30:19 +00:00
Filipe
7590b3ecf8
Merge pull request #8756 from jibees/8075-take-into-account-the-inherits_properties-attribute
...
Product that don't inherits from "producer"/"enterprise" properties should be filtered out by user on shop page
2022-02-21 19:04:08 +00:00
Matt-Yorkley
6c695df917
Merge pull request #8895 from Matt-Yorkley/cloned-subscription-syncing
...
Sync subscriptions on newly-cloned order cycles
2022-02-17 12:44:39 +00:00
Matt-Yorkley
00fa84e3b5
Sync when switching from nil dates to open
2022-02-16 21:45:43 +00:00
Matt-Yorkley
5913720c85
Sync for both open and upcoming OCs when switching from closed
2022-02-16 18:33:09 +00:00
Matt-Yorkley
4592827261
Sync OC subscriptions if transitioning from closed to open
2022-02-16 13:03:27 +00:00
Matt-Yorkley
4260422ea7
Remove a couple of unnecessary memory assignments
2022-02-16 12:55:19 +00:00
Matt-Yorkley
d4488fdb3f
Return early if OC is closed
2022-02-16 12:53:22 +00:00
Matt-Yorkley
8c8b9d1b23
Sync subscriptions on newly-cloned order cycles
2022-02-16 10:44:22 +00:00
Maikel Linke
d09ba16411
Associate customers again
...
And simplify the before_validation actions.
2022-02-16 10:23:23 +11:00
François Turbelin
554a8625e5
Refactor ensure_customer method
2022-02-16 10:23:23 +11:00
François Turbelin
4cb31d04a7
Repair specs with default values on ensure_customer method
2022-02-16 10:23:23 +11:00
Adrien Chauve
ca46359224
More fixes
2022-02-16 10:23:22 +11:00
Adrien Chauve
9b93102a96
More fixes
2022-02-16 10:23:22 +11:00
Adrien Chauve
ba6523bb76
Add Customer.full_name
2022-02-16 10:23:22 +11:00
Adrien Chauve
5ca4d549e7
Update customer creation
2022-02-16 10:23:22 +11:00
Matt-Yorkley
8084ad0068
Extract a comment-method so the code conveys it's purpose
2022-02-15 12:17:08 +00:00
Nihal M. Kelanthodika
9215ccc353
Prevents creation of payment adnustment when refunding or crediting an order
2022-02-15 11:52:26 +00:00
SarvarKhalimov
d69f42e940
Update app/models/product_import/entry_validator.rb
...
Co-authored-by: Maikel <maikel@email.org.au >
2022-02-15 00:10:32 +05:00
SarvarKhalimov
42a0a973ba
Fix product import on existing, empty unit_type and variant_unit
2022-02-13 18:28:21 +05:00
Matt-Yorkley
e5818955ff
Invalidate all incomplete payments when creating a new one, not just those in "checkout" state.
...
Looking at prod data; when a checkout submission fails due to something like a card being out of date, the payment's state seems to be "pending" and not "checkout", which means this mechanism fro invalidating old payments is potentially not working where it should.
2022-02-11 17:25:27 +00:00
Filipe
6e2c4a385a
Merge pull request #8810 from Matt-Yorkley/split-checkout-tax
...
Reduce expensive tax recalculation calls
2022-02-10 17:42:39 +00:00
Filipe
820417e6cc
Merge pull request #8828 from apricot12/8794-Keep_schedule_when_cloning_OC
...
Carry over linked schedule to cloned Order Cycle
2022-02-10 17:09:56 +00:00
Jean-Baptiste Bellet
50f547af98
Add an attribute that conditions the sending of the cancellation email
...
true by default to not change the default behavior.
Can be set to false when sending params send_cancellation_email
2022-02-10 14:39:00 +01:00
Filipe
30c1d89525
Merge pull request #8822 from Matt-Yorkley/split-checkout-payment-total
...
[Split Checkout] Move setting of payment total during checkout into OrderUpdater
2022-02-09 16:21:47 +00:00
Maikel Linke
572a65b324
Create a scope to retrieve product based on its properties
...
both inherited and own product properties
Update the product spec to test the scope that concern properties
2022-02-07 08:57:18 +01:00
