Cillian O'Ruanaidh
7e40ad39cb
Bring back select all checkboxes on order cycle checkout options form.
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
a53a3259a8
Connect DistributorShippingMethods to OrderCycles instead of Spree::ShippingMethods
...
Before if a shipping method was shared between multiple distributors it could only be disabled/enabled on that order cycle for all the distributors which have that shipping method e.g. you couldn't select that shipping method for one distributor but disable it for another.
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
65ee9e1486
Implement new design with shipping and payment methods on different rows instead of same one, the select all checkboxes still need to be added back later
...
This is the new design from https://github.com/openfoodfoundation/openfoodnetwork/pull/9262#issuecomment-1206673689
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
a73b608f8a
Remove 'shared' shipping method sections from order cycle checkout options form, any shared shipping methods are to be displayed for each distributor e.g. if they belong to multiple distributors they will be displayed multiple times
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
4b0b4ad991
Revert "Use a more simple layout on the order cycle checkout options form"
...
This reverts commit 0dddaa6c2b9f1925adca6ff8deac8181691ae119.
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
8e47949260
Check 'Select all' checkboxes on page load if all its checkboxes are checked
...
This means the code to set the initial value in the view template isn't needed.
2022-09-30 13:13:39 +01:00
Maikel Linke
195f1e1237
Make "Select all" translatable
2022-09-30 13:13:39 +01:00
Maikel Linke
26d5ea6cdc
Remove unused input name
2022-09-30 13:13:39 +01:00
Maikel Linke
c5bb2f52e1
Check "Select all" to start with
...
Reflect the state of the shipping method checkboxes.
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
87431c188e
Use ShippingMethod :frontend method and drop :backend to avoid ClassLength Rubocop error
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
0673f9a5ae
Use a more simple layout on the order cycle checkout options form
...
Before there was a row for each distributor and a 'shared' row for shipping methods which were shared among more than one distributor. This layout displays a single list of shipping methods with the distributor or distributors it belongs to beside it as suggested by @lin-d-hop
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
8cb2767f9a
The no shipping/payment method warnings on order cycle checkout options looks better left aligned
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
1a70cc0c4c
Don't display no shipping/payment method warnings on order cycle checkout options if the distributor has some that are shared with other distributors
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
464a9b95a4
On order cycle checkout options shipping methods shared between distributors should be checked by default too
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
472bd150bb
For consistency with other '<em>' don't strip whitespace.
...
Although both '%em' and '%em>' are rendering the same markup, perhaps because the tag is on it's own new line.
Co-authored-by: Maikel <maikel@email.org.au >
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
6453bbcc1c
Fix :selected_shipping_method_ids param for shared shipping methods.
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
564e4d802c
Don't use :html_safe with payment method name in checkout options in case it contains something malicious
...
Co-authored-by: Maikel <maikel@email.org.au >
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
7bd56007bd
Don't use :html_safe in case shipping method name contains something malicious in app/views/admin/order_cycles/checkout_options.html.haml
...
Co-authored-by: Maikel <maikel@email.org.au >
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
d9de35799d
Array difference operator is neater than reject in app/views/admin/order_cycles/checkout_options.html.haml
...
Co-authored-by: Maikel <maikel@email.org.au >
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
67d4c38550
Rename :preferred_shipping_methods to :selected_shipping_methods on OrderCycle
...
It's a clearer name because 'preferred' implies there could be other unpreferred shipping methods available as well.
Co-authored-by: Maikel <maikel@email.org.au >
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
fc4f951a1a
Only require OrderCycleShippingMethod records if people want to override the default shipping methods
...
It makes things much simpler if we return all shipping methods by default without needing OrderCycleShippingMethod records to be added to the database.
Co-authored-by: Maikel <maikel@email.org.au >
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
855ec1a708
Add new 'Checkout options' step to the edit order cycle form so people can attach shipping methods
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
a5daee39e3
Extract out a DISPLAY_ON_OPTIONS constant in Spree::ShippingMethod instead of magic strings
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
37617f63ea
Remove non-functional :backend scope from Spree::ShippingRate
...
It finds shipping methods where 'display_on != front_end' but :front_end values were removed in a1317be19b/db/migrate/20200508101630_convert_frontend_shipping_method_to_both.rb
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
9b5f743fa5
Extract out a OrderCycle#simple? method so it can be used in models
2022-09-30 13:13:39 +01:00
binarygit
ebe4a3d6ab
Add StimulusReflex
2022-09-29 16:03:45 +02:00
Filipe
958c6fe8f3
Merge pull request #9685 from filipefurtad0/remove_js_tracking_code
...
Removes matomo JS tracking code
2022-09-28 23:15:23 +01:00
Maikel
5173ddb7a0
Merge pull request #9675 from filipefurtad0/split_build_consumer_tests
...
Makes build run all specs; fixes failing specs
2022-09-20 11:20:52 +10:00
filipefurtad0
136a4df4d9
Removes matomo JS tracking code
2022-09-19 15:26:07 +01:00
Jean-Baptiste Bellet
4a8dc37b40
Since #9087 , we don't use a boolean but an enum, 'public' or 'hidden'
2022-09-16 10:02:27 +02:00
binarygit
90f4b1328b
Remove angular from shipping methods tab in enterprise/edit
2022-09-13 15:20:33 +05:45
Maikel
44bf63137a
Merge pull request #9606 from binarygit/remove-angular-from-address
...
Remove Angular from Address Tab
2022-09-12 13:49:54 +10:00
Rachel Arnould
aa36986d66
Merge pull request #9521 from jibees/create-new-report-revenues-by-hub
...
Create a new report that shows revenues (incl. or excl. taxes) by hub only available for super-admin
2022-09-08 16:10:14 +02:00
Jean-Baptiste Bellet
53978de632
Create a new report that show revenues (incl. or excl. taxes) by hub
...
+ Create spec
2022-09-08 09:04:44 +02:00
Maikel
d9f5f7995d
Merge pull request #9611 from mkllnk/9605-tax-total
...
Index tax totals correctly for invoice display
2022-09-08 12:04:19 +10:00
Maikel
21054c1a8a
Merge pull request #9594 from binarygit/remove-angular-from-primary-details
...
Remove Angular from Primary Details Tab
2022-09-06 10:17:14 +10:00
binarygit
abbb61b943
Remove country controller from enterprises/new and Business Details tab
2022-09-05 09:52:27 +05:45
binarygit
36b5cb3b49
Replace country controller with dependent select in address tab
2022-09-05 09:52:27 +05:45
binarygit
0cfe842bd6
Fix typo: dependant to dependent in dependent-select controller
2022-09-05 09:52:27 +05:45
Filipe
8270a3f386
Merge pull request #9513 from filipefurtad0/matomo_tag_on_register_page
...
Add matomo_tag to /register pages
2022-09-01 10:19:54 +01:00
Maikel Linke
91eaa522cf
Simplify tax totals helper
2022-08-31 16:47:04 +10:00
Maikel Linke
2a57dc9766
Index tax totals correctly for invoice display
2022-08-31 16:47:04 +10:00
Maikel Linke
f37b681fac
Allow more tax data in the summary
...
I converted the value to a hash so that we can put all information in
there and we won't need the current hash key as percentage any more.
2022-08-31 16:47:04 +10:00
binarygit
02e3184945
Replace angular tooltips in Primary Details tab
2022-08-31 11:51:51 +05:45
Maikel
04778c6fa8
Merge pull request #9597 from saunmanoj888/fix-account-setting-headers-alignment
...
Fix alignment for header Developer settings under Accounts settings
2022-08-31 16:01:41 +10:00
binarygit
8861b6d077
Replace permalinks angular ctrl with stimulus
2022-08-31 10:06:51 +05:45
binarygit
52b1f40acb
Replace select2 with tom-select in primary details tab
2022-08-31 10:06:51 +05:45
Filipe
8ace56956b
Merge pull request #9560 from binarygit/replace-tooltip
...
Replace tooltip on Enterprise Settings /contact page
2022-08-30 16:23:09 +01:00
saunmanoj888
5e69320ff5
Fix header alignmnet
2022-08-27 15:31:19 +05:30
binarygit
b76d9045ce
Replace power-tip in enterprises/edit/<name>/contact with floatingUI
2022-08-24 13:31:45 +05:45
