raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,227 Commits 21 Branches 450 Tags
91880cdbecc285e87f77aaf1aca0fef8fd7563ef
Commit Graph

1207 Commits

Author SHA1 Message Date
Cillian O'Ruanaidh
a9664e103d Merge latest :master into :drop-blockenspiel branch and resolve conflicts related to Rubocop fixes. 2020-06-29 18:11:08 +01:00
Luis Ramos
0ba1642bd2 Fix rubocop issues 2020-06-22 17:39:20 +01:00
Luis Ramos
1b5f9f105a Fix block alignment 2020-06-22 17:39:20 +01:00
Luis Ramos
b879439d58 Use rubocop auto correct to fix Style/SafeNavigation issue 2020-06-22 16:51:46 +01:00
Luis Ramos
f848a89a00 Rename update_attributes to update #rails4 2020-06-22 16:51:43 +01:00
Luis Ramos
e574e254db Use rubocop autocorrect to fix rubocop issue 2020-06-22 12:57:12 +01:00
Luis Ramos
fb92745db4 Fix rubocop issues 2020-06-22 12:41:31 +01:00
Pau Pérez Fabregat
dd9d9e3316 Merge pull request #5639 from luchiago/fix-seeds-on-setup 
FIx setup seed
 2020-06-19 16:49:16 +02:00
Pau Pérez Fabregat
db80992326 Merge branch 'master' into drop-blockenspiel 2020-06-19 12:12:10 +02:00
Lucas Hiago
52da896b03 Fix name when try to search on seed 2020-06-18 21:06:04 -03:00
Pau Pérez Fabregat
e02191078d Merge pull request #5595 from coopdevs/improve-payments-report-performance 
Remove N+1 fetching payments in report
 2020-06-18 12:32:40 +02:00
François Turbelin
9abe41f6cb Use OrderTaxAdjustmentsFetcher service 2020-06-16 14:01:27 +02:00
Pau Pérez Fabregat
257b311e04 Merge pull request #5158 from openfoodfoundation/3-0-stable 
Merge 3-0-stable to master
 2020-06-15 13:35:58 +02:00
Pau Perez
456f369b76 Fix outstanding Rubocop violations 2020-06-15 10:17:34 +02:00
Pau Perez
df887b5576 Wrap long line 
pick e84e0aebe Fix fatal error in reports helper for orders without payments
pick e725f3331 Defend from an order w/o payments when building table
 2020-06-15 09:25:30 +02:00
Pau Perez
018772bbba Remove N+1 fetching payments in report 2020-06-12 16:42:40 +02:00
Pau Perez
29246c15fe Defend from order without billing address 
This a data integrity issue that needs deeper investigation but while
this happens, our users can still render their reports.
 2020-06-12 16:34:23 +02:00
Matt-Yorkley
e725f33318 Defend from an order w/o payments when building table 2020-06-11 12:37:51 +02:00
Cillian O'Ruanaidh
406309c577 Move BulkCoop reports out of deprecated lib/ directory into OrderManagement engine. 
The BulkCoop reports are not generated the same way as the EnterpriseFeeSummary report is generated yet so that may need to be updated.
 2020-06-05 16:43:38 +01:00
Cillian O'Ruanaidh
d436d18d19 Fix code climate violations in removal of Blockenspiel dependency. 2020-06-05 10:13:06 +01:00
Cillian O'Ruanaidh
d02f64da06 Define bulk coop report summary row and columns with lists of method names instead of Procs. 2020-05-29 11:34:12 +01:00
Cillian O'Ruanaidh
1fba998b9e Drop Blockenspiel and use :rules/:columns methods instead of :organise/:summary_columns DSL. 
For https://github.com/openfoodfoundation/openfoodnetwork/issues/3231
 2020-05-28 19:04:18 +01:00
Luis Ramos
f34f693620 Merge branch 'master' into 3-0-stable-may-22 2020-05-22 22:54:19 +01:00
Luis Ramos
6fcca0197c Merge pull request #5450 from rmklaus12/5095-ordercycle-amtqty-translations 
Changed report_header fields for amount and quantity to reflect corre…
 2020-05-21 21:21:14 +01:00
Maikel Linke
2d95e9ebc0 List each order only once in report 2020-05-19 10:38:28 +10:00
Robin Klaus
311bbd2aa2 Changed report_header fields for amount and quantity to reflect correct translation to French 2020-05-18 18:41:04 +10:00
Luis Ramos
19da0ba969 Merge branch 'master' into 3-0-stable-may13 2020-05-13 19:50:32 +01:00
Luis Ramos
1671184a3c Merge pull request #5375 from luisramos0/sample_order 
[Spree 2.1] OFN v3 comes with sample orders :-)
 2020-05-13 12:04:06 +01:00
Luis Ramos
be998a9eb6 Reload shipment before shipping otherwise shipment stays as ready but with shipped_at defined 2020-05-13 12:00:37 +01:00
Matt-Yorkley
ab143ceaed Merge pull request #5352 from pacodelaluna/change-date-displayed-on-sales-tax-report 
Change date displayed on sales_tax reports
 2020-05-11 09:56:38 +02:00
Pau Pérez Fabregat
c38c59b0b9 Merge pull request #5223 from luisramos0/def_user 
Change default user from spree@example.com to ofn@example.com ❤️
 2020-05-08 09:51:31 +02:00
Luis Ramos
d967d855fc Merge pull request #5319 from Matt-Yorkley/caching-by-class 
[Caching] Caching data by class
 2020-05-07 11:43:44 +01:00
Pau Pérez Fabregat
65433c6ac6 Merge pull request #5351 from luisramos0/improve_sample_data 
Improve ship methods names on sample data
 2020-05-06 11:27:34 +02:00
Luis Ramos
825f747dff Add more types of sample orders 2020-05-05 23:16:54 +01:00
Luis Ramos
4083da5b16 Add sample order to sample data 2020-05-05 23:16:54 +01:00
Luis Ramos
be4104d6f3 Merge branch 'master' into 3-0-stable-may-5 2020-05-05 19:11:20 +01:00
Luis Ramos
24414b83dd Merge pull request #5325 from oeoeaio/enhancement-5214 
Add order number and date/time to order cycles customer report
 2020-05-05 14:34:47 +01:00
François Turbelin
6e5cbebf4a Change date value on order_and_distributor_report 2020-05-05 12:27:17 +02:00
François Turbelin
9cfd7db99d Change date displayed on sales_tax reports 2020-05-05 12:27:17 +02:00
Luis Ramos
44872844ed Make ship methods in sample data have the name of the enterprise so it's easier to distinguish them 2020-05-03 16:36:12 +01:00
Luis Ramos
bf0b941e1c Merge pull request #4935 from coopdevs/data-archiving 
Allow data archiving using the :truncate_data task
 2020-05-03 12:58:31 +01:00
Luis Ramos
92d0a5b735 Change default user from spree@example.com to ofn@example.com 2020-05-03 10:12:43 +01:00
Pau Perez
647a7bdddf Clarify we won't use truncate_date in prod yet 
We initially aimed at implementing data archiving in production reusing
this rake task but priorities have changed. It'll be just a refactor for
now.
 2020-04-29 17:00:53 +02:00
Pau Perez
e0228f66af Default to archiving data older than 2 years. 
This is safer than the current 3 months.
 2020-04-29 16:49:43 +02:00
Pau Perez
38ea95ea85 Prevent nil input to turn into 0 2020-04-29 16:49:43 +02:00
Pau Perez
6ceeda7d9e Instrument TruncateData logging start and end 2020-04-29 16:49:43 +02:00
Pau Perez
703706ee0b Replace one-letter variable with full word 2020-04-29 16:49:43 +02:00
Pau Perez
e2a3dd0c6f Delete only return auths. of the deleted orders 
They are associated to order and as such we can't remove them all
blindly.
 2020-04-29 16:49:43 +02:00
Pau Perez
a3b8638faf Delete sessions older than two weeks 
This affects users that are actively purchasing, so 2 weeks data is more
than enough. Others can afford to log in again.
 2020-04-29 16:49:43 +02:00
Pau Perez
4f015320a3 Upper case DELETE statement 
This keeps it consistent with the rest of the log.
 2020-04-29 16:49:43 +02:00