raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-04-01 06:41:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,237 Commits 15 Branches 460 Tags
83c0093665a7636851a0122e8a4f4eb8716ef4ba
Commit Graph

2424 Commits

Author SHA1 Message Date
Rohan Mitchell
d794981ecf Add form field to set tax when creating adjustment on order. Display tax included in adjustments on order interface. 2015-11-11 11:53:04 +11:00
Rob Harrington
d731d4e803 Making sure flash is a hash so that is can be used to initialize OpenStuct 2015-11-05 11:09:21 +11:00
Lynne Davis
7350dbb75e Adding tweaks that have been missed from merges 2015-10-30 11:54:06 +11:00
Rob Harrington
5b3e052f78 Using a compiled stylesheet for pdf styling 2015-10-16 21:36:18 +11:00
Rob Harrington
40d627cb34 Adding new route for printing an order to pdf 2015-10-16 17:25:40 +11:00
Rob Harrington
6e7fc6a0f7 Adding invoice action to orders controller, to allow sending of invoice email 2015-10-16 17:25:40 +11:00
Rob Harrington
104b100fe6 Pulling distributor signoff out into separate partial 2015-10-16 17:25:39 +11:00
Rohan Mitchell
b5bc4701fa Detailed xero report 2015-09-22 09:15:55 +10:00
Rob Harrington
1c6f3f4877 Translating words on admin accounts page 2015-09-17 22:38:29 +10:00
Rob Harrington
2dcbe2b4f2 Updating the admin account view to show use the new account_invoice model to display data 2015-09-17 22:38:29 +10:00
Rob Harrington
ae30007fed Redesignating all references to user_invoices as account_invoices 2015-09-17 22:38:28 +10:00
Rob Harrington
5eb20fd8cd Adding tax settings for billing enterprise users 2015-09-17 22:38:13 +10:00
Rob Harrington
01c9560a19 Account page reads from created at date of invoice 2015-09-17 22:38:13 +10:00
Rob Harrington
6cc403cd92 Preventing double creation of invoices by recognising completed invoices within the specifed period 2015-09-17 22:38:13 +10:00
Rob Harrington
448bd12e9f Adding billing tasks to whenever schedule 2015-09-17 22:38:12 +10:00
Rob Harrington
6665f9b4a0 Adding global settings for controlling automatic scheduling of accounts tasks 2015-09-17 22:38:12 +10:00
Rob Harrington
619c4959ff Removing button for updating billable periods from accounts and billing settings page 2015-09-17 22:38:12 +10:00
Rob Harrington
128b6853f4 Styling tweaks to the admin account page 2015-09-17 22:38:11 +10:00
Rob Harrington
7c5816af82 Switching accounts interface over to showing invoices 2015-09-17 22:38:10 +10:00
Rob Harrington
c53b5f3edb Adding finalize step to accounts and billing settigns page + controller 2015-09-17 22:38:10 +10:00
Rob Harrington
8bbda5715d Adding basic template for account page 2015-09-17 22:38:10 +10:00
Rob Harrington
c2c0c3684d Refactoring accounts and billing settings controller, adding start_job action 2015-09-17 22:38:09 +10:00
Rob Harrington
e6f6a3ad81 Commenting out global configs for nightly job switches, use a button to manually run jobs instead (for now) 2015-09-17 22:38:09 +10:00
Rob Harrington
0812643136 Adding views and feature spec for updating default payment and shipping method 2015-09-17 22:38:08 +10:00
Rob Harrington
fa8c3d65dc Adding settings for global accounts and billing setup 2015-09-17 22:37:56 +10:00
Maikel Linke
51064f31a3 Merge remote-tracking branch 'origin/master' into uk-variable-weights-improvements 2015-09-10 16:05:28 +10:00
Maikel Linke
e25805aa78 Restoring all changes of the last combined branch 
This reverts commit 1e55e8a907.
 2015-09-10 15:03:13 +10:00
Maikel Linke
1e55e8a907 Reverting all changes of the last combined branch 
The production server hangs on certain requests. To rule out a code bug,
we revert to the last deployed version.
 2015-09-10 12:50:40 +10:00
Maikel Linke
f0709d5e46 Merge branch 'show-only-visible-shops' into combined/shopfront_group-buy_customer-contact 2015-09-04 21:49:12 +10:00
Maikel Linke
a3074fa51e Merge branch 'customer-contact-in-order-email' into combined/shopfront_group-buy_customer-contact 2015-09-04 21:47:35 +10:00
Maikel Linke
c1cbf9a35c Merge branch 'group-by-unit-size-display' into combined/shopfront_group-buy_customer-contact 2015-09-04 21:47:22 +10:00
Maikel Linke
2e3ff8f5c6 doubling cart buttons 2015-09-03 15:52:54 +10:00
Maikel Linke
93f6667c4b Update products group by spec 2015-09-03 15:01:28 +10:00
Maikel Linke
23355d1a25 include order email and phone number in email for shop 2015-09-03 14:46:08 +10:00
Maikel Linke
0fdd000589 Showing Bulk Unit Size in BulkCoopReport 
The group_buy_unit_size field is now shown even if 'group buy' is not
enabled. And "Group By Unit Size" is now displayed as "Bulk Unit Size".
 2015-09-03 12:26:40 +10:00
Maikel Linke
57caeb64c5 Remove unused product form partial 2015-09-03 12:24:57 +10:00
Continuous Integration
d3e66bcfa5 Auto-merge from CI [skip ci] 2015-09-02 14:44:05 +10:00
Maikel Linke
1a96ef88bc Hiding invisible hubs in producer modal 2015-08-28 10:49:36 +10:00
Maikel Linke
64834dd50a Fixing display of cloned products 
The producer and the unit is displayed again.
 2015-08-27 13:05:09 +10:00
Continuous Integration
d595e1558a Auto-merge from CI [skip ci] 2015-08-26 10:03:13 +10:00
Rohan Mitchell
e843beaf18 Remove enterprise address from order confirmation and mailer, since in these contexts the pickup location will be specified elsewhere. #636 2015-08-07 14:19:48 +10:00
Rohan Mitchell
719ddea789 Merge branch 'variable-weights-improvements' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-variable-weights-improvements 2015-08-07 11:10:07 +10:00
Continuous Integration
14900655df Auto-merge from CI [skip ci] 2015-08-05 12:18:31 +10:00
Lynne Davis
8639109372 Variable weights improvements additions 2015-08-04 20:13:28 +01:00
Rohan Mitchell
679531fe2a Prompt for clear cart when order cycle changes 2015-07-31 16:56:08 +10:00
Rohan Mitchell
5688cfd1dd WIP: Rename ofnEmptiesCart to ofnChangeHub 2015-07-31 16:56:08 +10:00
Rohan Mitchell
ec908fce92 Make TOS URL configurable 2015-07-31 14:51:17 +10:00
Continuous Integration
8d041f5e7a Auto-merge from CI [skip ci] 2015-07-29 12:03:03 +10:00
Rohan Mitchell
61a39ea82f Cherry-pick 00927f7: Refactoring to move bulk out of reports_controller_decorator 2015-07-22 15:25:12 +10:00
Rohan Mitchell
5fd3dc1d28 Customise footer logo 2015-07-17 16:24:07 +10:00