Maikel
c11dd2c1fb
Merge pull request #10642 from macanudo527/fix_rubocop_errors
...
Fix Rubocop Layout/LineLength
2023-04-05 16:11:08 +10:00
Neal Chambers
940f806e5f
Fix Rubocop Layout/LineLength
2023-04-04 09:44:15 +09:00
Jean-Baptiste Bellet
4fa44e6c64
Put the white label behind a feature toggle white_label
...
+ update specs as well
+ for admin section also
2023-03-30 09:19:17 +11:00
Jean-Baptiste Bellet
4ad2a1a723
Prefer a concern that set a variable instead of a global helper
...
Therefor, for the right controllers, simply implements:
```
include WhiteLabel
before_action :hide_ofn_navigation, only: [:show, :edit]
```
This is mort robust, since we're working in a controller level, not parsing URLs...
2023-03-30 09:17:57 +11:00
Jean-Baptiste Bellet
348c1ff7da
Hide the OFN navigation menu when distributor as set its preference
...
Hide, when preference is true, for page:
- shop
- cart
- checkout
- order confirmation
2023-03-30 09:17:57 +11:00
Jean-Baptiste Bellet
3452864503
Add "white label" panel in enterprise settings page
2023-03-30 09:17:57 +11:00
Jean-Baptiste Bellet
d2f29b7d73
Some refactoring to avoid rubocop class too long warning
2023-03-30 09:13:35 +11:00
Gaetan Craig-Riou
7dc5bc87d1
Fix rubocop warnings
2023-03-28 13:39:29 +11:00
Gaetan Craig-Riou
f9f6793d10
Add template and basic controller for backoffice voucher pages
2023-03-28 13:39:29 +11:00
Ana Nunes da Silva
bb71b281d6
Remove print ticket links
2023-02-14 08:08:20 +00:00
Filipe
678c60c9b6
Merge pull request #10175 from abdellani/tax_totals_with_rates_by_producer_report
...
Tax Totals with Rates by Producer Report
2023-01-30 13:56:48 +00:00
Filipe
7b14afbabe
Merge pull request #10294 from abdellani/fix_invoice_print_spec
...
fix the pending invoice print spec
2023-01-23 19:06:36 +00:00
Mohamed ABDELLANI
c87c8ed0df
subreport filtering partial
2023-01-21 18:39:33 +01:00
Mohamed ABDELLANI
9bff2718c7
implement display_line_items_taxes to render included & added tax
2023-01-21 08:16:05 +01:00
Jean-Baptiste Bellet
c99ec38c85
By default, we reject all adjustements with amount equal to 0
2023-01-20 11:20:35 +01:00
Jean-Baptiste Bellet
20596b9441
Mark as icon-remove and then considered as secondary
2022-12-16 15:49:38 +01:00
Jean-Baptiste Bellet
9dd81604e9
Put navigation menu into span even if no icon next to it
2022-11-21 09:48:35 +01:00
Cillian O'Ruanaidh
4e6d64c0a1
Let people choose which payment methods are available to customers on order cycles
2022-10-21 17:21:31 +01:00
Jean-Baptiste Bellet
8b89c901ef
Do not display "Admin and Handling" ie. fees total
2022-10-08 10:00:57 +02:00
Jean-Baptiste Bellet
72df2867d4
Remove admin_and_handling merging
...
+ update specs as well
2022-10-08 10:00:57 +02:00
David Cook
13d95ecf1d
Scope Enterprise Group side menu translations
...
With it's own lazy scope, we no longer need to define labels separately.
2022-10-04 19:39:29 +02: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
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
da3eea6005
Fetch shared shipping/payment methods for order cycle checkout options in single query
2022-09-30 13:13:39 +01:00
Cillian O'Ruanaidh
bff7650b35
Change :available_shipping_methods helper to use new OrderAvailableShippingMethods service.
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
94d71b8dce
Remove extra unnecessary :display_on_checkout scope and reuse :frontend scope instead
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
Maikel Linke
326b0af35f
Sort tax total by percentage on invoice
2022-09-01 11:19:02 +10: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
27552c99b8
Render enterprise groups #edit and #new page using stimulus
2022-08-10 15:14:09 +05:45
binarygit
e18a242b90
Render admin/enterprises/<name>/edit page using stimulus
2022-08-10 15:08:59 +05:45
Jean-Baptiste Bellet
bb6298d06d
Check for enterprise_number_required_on_invoices boolean
...
if true, then can edit invoice ;
if false, then print a confirm alert popup to specify that a enterprise number must be set for this enterprise
2022-06-28 09:53:46 +02:00
Filipe
6ff2d4a9d5
Merge pull request #9109 from apricot12/8917-Link-to-enterprise-site
...
Adding a link to enterprise's own site from Order confirmation page.
2022-06-02 17:59:03 +01:00
Sebastian Castro
8a943f50ef
Reports: Format cells for html, pdf, and spreadsheet
...
Currency, number format, dates
2022-05-12 16:54:14 +02:00
Sebastian Castro
287e8f5845
Reports Refactor 3
...
Easily group and create header and summary row
Auto format cells when appropriate type (boolean, dates) and render_format (neither csv nor json)
2022-05-12 16:54:13 +02:00
Sebastian Castro
452a3fa933
Reports Refactor 2: Merge Spree::reports into Admin::Reports
2022-05-12 16:54:13 +02:00
Sebastian Castro
4a99a7d1de
Report Refactor 1: Xero Invoices
2022-05-12 16:54:13 +02:00
GeorgeThoppil
8903496a1b
Optional restocking items
2022-05-06 10:55:24 -04:00
Nihal Mohammed
af58ba523c
Renamed groups_helper to link_helper and removed strip_url method, as well as updated specs and ApplicationHelper. Added "Back To Website" button and i18n.
2022-04-26 01:38:25 +05:30
Filipe
c535ed5789
Merge pull request #8936 from cillian/language-metatags
...
Include language metatags in html template when more than one language available
2022-03-17 16:16:07 +00: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
Cillian O'Ruanaidh
21affa6250
Include language metatags in html template when more than one language available
...
Fixes #8902
This is to help Google find pages in all languages, see https://developers.google.com/search/docs/advanced/crawling/localized-versions
2022-02-25 12:49:49 +00:00
Jean-Baptiste Bellet
a951fd2c06
Create a new method pdf_stylesheet_pack_tag that actually include CSS file
...
If running in developpement (ie. `Webpacker.dev_server.running?`), use webpacker to actually render/serve the CSS files.
Source: https://stackoverflow.com/a/60541688
2022-02-09 11:21:50 +01:00
Matt-Yorkley
370ec17818
Improve countries and states loading
2022-01-30 11:33:31 +00:00
Filipe
1120e4e460
Merge pull request #8759 from jibees/8547-use-the-last-payment-in-the-Payment-Method-Report
...
Use the last payment method instead of the first for the Payment Method Report
2022-01-24 12:51:08 +00:00
