raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
26,176 Commits 18 Branches 451 Tags
d00e75de70821663fc4e8c8dfafd94f066768c1c
Commit Graph

73 Commits

Author SHA1 Message Date
Filipe
d0897ec677 Merge pull request #10248 from jibees/10117-reports-in-order-cycle-customer-totals-incorrect-sorting-when-lastname-first-letter-isnt-capitalized 
Reports, Orders and fulfillment: Sort by customer lastname + firstname case insensitive
 2023-02-02 14:39:10 +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
Mohamed ABDELLANI
19df15d75b move item group instruction from db to rails 2023-01-21 18:40:27 +01:00
Mohamed ABDELLANI
92c4bd9eb7 introduces format_percentage in ReportRowBuilder#format_cell 2023-01-21 18:40:27 +01:00
Maikel Linke
19c4596b9e Untie report from request object 
We want simple report arguments to store it as background job.
 2023-01-18 23:12:26 +00:00
Mohamed ABDELLANI
61037aa5ad sales tax totals by producers report 2023-01-17 08:37:47 +01:00
Jean-Baptiste Bellet
8958fe4199 Orders and fulfilment: Sort by lastname + firstname case insensitive 2023-01-06 15:36:12 +01:00
Mohamed ABDELLANI
e3914ed306 add final_weight_volume column to the hidden by default column of OCCT report 2022-12-26 08:29:36 +01:00
Filipe
47e100607c Merge pull request #10041 from abdellani/add_on-hand_and_on-demand_to_product_report 
Add 'on hand' and 'on demand' to Products report
 2022-12-21 17:31:21 +00:00
Mohamed ABDELLANI
86c25e1d48 add on_demand/on_hand columns to all products_and_inventory/all_products report 2022-12-06 08:42:42 +01:00
Mohamed ABDELLANI
f7cd168f6d define producer_charges_sales_tax && product_tax_category as new hidden by default columns 2022-12-05 08:44:33 +01:00
Konrad
07c29df801 Merge pull request #10039 from abdellani/fix_missing_products_in_bulk_coop_packing_sheets_report 
fix Missing products in Bulk co-op Packing Sheets report
 2022-12-02 18:19:47 +01:00
Mohamed ABDELLANI
845133d3f6 group line_items by [customer,variant] in bulk/coop/packing_sheets 2022-11-24 11:06:09 +01:00
Mohamed ABDELLANI
dafbefe8e3 add sku to OCST report as hidden by default column 2022-11-23 09:50:34 +01:00
Filipe
a7353eb69f Merge pull request #9575 from apricot12/9487-Dimensions-Packing-Reports 
Added HEIGHT, WEIGHT, WIDTH, DEPTH columns to packing reports by customer.
 2022-11-10 09:55:26 +00:00
Jean-Baptiste Bellet
3e9647590d Packing report don't need untranslated headers for xlxs, csv format 2022-11-07 15:53:39 +01:00
Maikel Linke
7081e712e8 Flag style issue on todo list for later 
The code needs some bigger refactoring to avoid this style issue.
 2022-10-25 10:09:26 +02:00
Nihal Mohammed
5c0f3a2d4b Add weight, height, width, depth fields to pack by customer reports 
+ update specs by adding dimensions fields into reports specs
 2022-10-25 10:09:26 +02:00
Mohamed ABDELLANI
4740c2b0db add sort by product name to order_cycle_supplier_totals_by_distributor report rules 2022-10-24 09:01:42 +01:00
Maikel Linke
c22f6cb805 Add more fields to revenue report as used by Aus 
We currently maintain our own CSV generation script which could be
replaced if we got all this information here.
 2022-10-18 12:51:13 +11: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 Linke
0ebc803e22 Simplify reports SQL query 2022-07-26 11:05:41 +10:00
Jean-Baptiste Bellet
09adc8f690 In Enterprise Fees Summary report, SUM column should be numeric 
+ update specs as well
 2022-07-25 15:08:39 +02:00
Jean-Baptiste Bellet
2a35c48498 Do not format price as currency, but as number 
for all the `Packing Reports`, ie
Pack By Customer
Pack By Supplier
Pack By Product
 2022-07-22 09:28:36 +02:00
Jean-Baptiste Bellet
ce0031934a Do not format sum_total as currency, but as number 
For the `Bulk Co-op Supplier Report` report
 2022-07-22 09:27:52 +02:00
Rachel Arnould
40f3d4df4f Merge pull request #9312 from filipefurtad0/revert_9268_supplier_totals 
Splits results per supplier on OC Distributor Totals by Supplier report
 2022-06-17 10:53:19 +02:00
jibees
19b57aa74e Merge pull request #9246 from jibees/9228-do-not-include-shipping-method-in-the-summary-row-for-Order-Cycle-Distributer-Totals-by-Supplier-report 
Do not include shipping method in the summary row for the Order Cycle Distributer Totals by Supplier report
 2022-06-17 09:30:31 +02:00
filipefurtad0
0a70e091cd Reverts #9268 for supplier totals 2022-06-15 13:50:22 +01:00
Rachel Arnould
9e1226be28 Merge pull request #9268 from jibees/9267-Wrong-report-when-selecting-multiple-shops 
Split orders across several shops of same order cycle instead of aggregating in several Orders and Fulfilment reports
 2022-06-09 18:03:13 +02:00
Jean-Baptiste Bellet
bcc4ec365d Format date in summary row as it's formatted in a row 
for order cycle customer totals report

+ update specs
 2022-06-08 12:18:50 +02:00
Jean-Baptiste Bellet
3defd81ca6 Group by e.order.distributor_id on Orders & Fulfillment Reports 2022-06-08 09:47:09 +02:00
Jean-Baptiste Bellet
2c2c48071d Since query_result method is the same, use inheritance 2022-06-07 10:53:25 +02:00
Jean-Baptiste Bellet
ec338bca9c Do not include shipping method in the summary row 2022-05-30 11:14:29 +02:00
lin-d-hop
fb2279d26d Draft PR with potential fix to the reports S1. Untested. 2022-05-25 22:08:05 +01:00
Rachel Arnould
cb6cb05eca Merge pull request #9192 from jibees/9127-distinct-line-items-with-different-price 
For all `orders_and_fulfillment` reports, distinct product by `variant`, `price` & `order_id`
 2022-05-25 12:44:22 +02:00
Jean-Baptiste Bellet
e32797d2fd Do not group by order 2022-05-25 11:42:06 +02:00
Jean-Baptiste Bellet
f34b68a6e3 Add order date range to packing reports 2022-05-25 10:28:38 +02:00
Jean-Baptiste Bellet
be88b95e8c orders_and_fulfillment reports, distinct product by variant & price 2022-05-19 10:42:53 +02:00
Sebastian Castro
1be3b508bf Reports restore original results ordering 2022-05-12 16:54:14 +02:00
Sebastian Castro
294f7c2fb5 Reports restore original columns ordering 2022-05-12 16:54:14 +02:00
Sebastian Castro
89212736e9 Reports fix formatting cells 2022-05-12 16:54:14 +02:00
Sebastian Castro
56fab26235 Reports: refactor to easily provide default_params 2022-05-12 16:54:14 +02:00
Sebastian Castro
b7991e5ae8 Packing Report: use field name as columns headers in spreadsheet export 2022-05-12 16:54:14 +02:00
Sebastian Castro
0218f75f34 Packing Report: hide by default phone and price column to avoid breaking changes 2022-05-12 16:54:14 +02:00
Sebastian Castro
0545c9de28 Packing Report: revert column order change 2022-05-12 16:54:14 +02:00
Sebastian Castro
b54ec4354a Report TaxRate fix 2022-05-12 16:54:14 +02:00
Sebastian Castro
2dd31d970e Reports Format cells: format some reports 2022-05-12 16:54:14 +02:00
Sebastian Castro
5105ea345f Reports Refactor 4: Final Touch 
Split report_template
Clean code
Adds spec
 2022-05-12 16:54:14 +02:00
Sebastian Castro
b259f59d1e Packing Report: Adds new subreport "Pack by product" 2022-05-12 16:54:14 +02:00
Sebastian Castro
cd30012334 Report Refactor 3: Xero Invoices 
This one as actually not really been refactored, too much work to rewrite it so I just encapsulated the result within the new methods definitions
 2022-05-12 16:54:14 +02:00