elf Pavlik
2a4f3f9ae4
making test pass
2015-12-21 10:11:08 +01:00
knopfler81
ed48b691e1
translations in app/assets/javascripts/admin
2015-12-21 10:11:08 +01:00
Emmanuel
30141bd488
few translations in app/assets/javascripts/admin/
2015-12-21 10:11:08 +01:00
victor goutay
e16e3fba40
translations in app/assets/javascripts/admin/
2015-12-21 10:11:08 +01:00
ludivinecp
69ab113201
translations in app/assets/javascripts/admin/
2015-12-21 10:11:07 +01:00
Florian Vallen
7192f12a49
first js translation for admin interface
2015-12-21 10:11:07 +01:00
Florian Vallen
ec6962ea2c
Implements i18n translation for admin interface
...
it takes the i18n.js files from darkswarm.
This should be changed later and added to the
shared js folder.
At best, the namespacing for yml files should work
just as they work together with ruby, so
general:
sure: sure?
should point to t(general.sure)
2015-12-21 10:11:07 +01:00
elf Pavlik
8a390dd237
fixing test failing after i18n changes
2015-12-21 10:11:07 +01:00
julienFR88
5290d0be6b
add translation in /cache/code/ofn/openfoodnetwork/app/views/spree/admin
2015-12-21 10:11:07 +01:00
Edem
6cd7fbb455
all string translated in admin bulk orders management
2015-12-21 10:11:07 +01:00
Edem
8ccf527e01
all strings in app/views/spree/admin/overview/* translated!
2015-12-21 10:11:06 +01:00
Edem
d2ec4fcf88
Everything string translated in admin/entreprise_relationships
2015-12-21 10:11:06 +01:00
julienFR88
8fa293f561
my admin interface translations
2015-12-21 10:10:58 +01:00
apprenti
b58306aad8
my first translations
2015-12-21 09:47:18 +01:00
Edem
2a2f8f3531
admin entreprise_group are translated!
2015-12-21 09:47:18 +01:00
Maikel Linke
61a58bca7d
Travis can trigger the Github deploy API
...
And other build tools like Buildkite can listen to the deploy event.
2015-12-18 10:41:25 +11:00
Rob Harrington
e67e22ee73
Merge remote-tracking branch 'Em-AK/682-xero-report-defaults' into customer-name-security
...
Conflicts:
lib/open_food_network/xero_invoices_report.rb
2015-12-17 14:22:16 +11:00
Rob Harrington
7a23f671a2
Restricting access to orders within Sales Tax Report
...
Managers of suppliers should not be able to generate sales tax reports for orders they only supply products for
2015-12-17 14:21:30 +11:00
Rob Harrington
d115eb816e
Restricting access to orders within Xero Invoices Report
...
Managers of suppliers should not be able to generate xero invoices for orders they supply products for
2015-12-17 14:21:30 +11:00
Rob Harrington
4b5e33d5b0
Implementing new permissions for producers in reports_controller_spec
2015-12-17 14:21:30 +11:00
Rob Harrington
c579d302d5
Fixing customer info security for orders and distributors report
2015-12-17 14:21:30 +11:00
Rob Harrington
2f2ebf419c
Fixing customer info security for packing reports
2015-12-17 14:21:30 +11:00
Rob Harrington
2f13ab6adf
Fixing customer info security for orders and fulfillments report
2015-12-17 14:21:29 +11:00
Rob Harrington
b121984e76
Fixing customer info security for bulk coop report
2015-12-17 14:21:29 +11:00
Continuous Integration
23b9dd5c71
Auto-merge from CI [skip ci]
2015-12-17 13:02:37 +11:00
Maikel Linke
bc6110c178
Re-defining in_distributor scope as method to allow chaining
2015-12-17 12:42:28 +11:00
Rob Harrington
72f7e545dc
Making sure bill > 0 for finalize account invoice spec
2015-12-17 12:04:24 +11:00
Rob Harrington
e0da49e4df
Formatting dates for account invoices in rails time zone
2015-12-17 11:34:06 +11:00
Rob Harrington
b004060679
Printing invoices doesn't fail when order has no order cycle
2015-12-17 11:33:18 +11:00
Maikel Linke
ea68619f0b
Use bundled rails to prepare imported database
2015-12-17 10:31:31 +11:00
Rob Harrington
555f639026
Fixing unstable update_account_invoice specs
...
Rounding first then summing != summing first then rounding
2015-12-17 09:16:19 +11:00
Rob Harrington
26a2f1a280
Adjustments on account invoices are created based on presence of a bill
...
Rather than of turnover
2015-12-16 23:10:47 +11:00
Rob Harrington
83e3fb98f7
Only display billable period adjustments where the amount in > 0
...
Rather than where the bill (which is calculated according to current settings) is > 0
2015-12-16 19:18:59 +11:00
Rob Harrington
bac4fcbd8f
Make sure that adjustments for billable periods have a valid order to attach to when creating/updating
2015-12-16 19:18:59 +11:00
Rob Harrington
ecd11702c3
Fixing up enterprise user account page
2015-12-16 19:18:59 +11:00
Rob Harrington
fe0652e243
When updating a line_item quantity from 0, final_weight_volume is recalculated from the variants unit value
2015-12-16 19:18:59 +11:00
Rob Harrington
f49722ba90
Fixing broken BMC specs
2015-12-16 19:18:58 +11:00
Rob Harrington
0370723edd
Attempt to add a sensible name and contact number to Account Invoice addresses
2015-12-16 19:18:58 +11:00
Rob Harrington
d46712de84
Obsolete BillablePeriods only deleted if their associated order is not already complete
2015-12-16 19:18:58 +11:00
Rob Harrington
199a3c38f9
Bill is capped before tax is applied, like we say it is
2015-12-16 19:18:58 +11:00
Rob Harrington
0ed8cf973d
Adding an example bill calculator to business model config edit page
...
To allow super admin to see the effects of any changes they make to BMC settings
2015-12-16 19:18:58 +11:00
Rob Harrington
76d4f74f6b
Ammending BillablePeriod spec to be ensure tax is charged correctly
2015-12-16 19:18:58 +11:00
Rob Harrington
ca3c464fda
Reorganising busines model config settings, moving account invoice tax rate in busines model config settings
2015-12-16 19:18:57 +11:00
Rob Harrington
85f61364f8
BillablePeriods use global config to calculate bills
2015-12-16 19:18:57 +11:00
Rob Harrington
c1d04af5cc
Implementing monthly billing description logic in required pages
2015-12-16 19:18:57 +11:00
Rob Harrington
5b72f53738
Adding helper for describing monthly billing charges
2015-12-16 19:18:57 +11:00
Rob Harrington
da325780b1
Adding BMC link to configurations menu
2015-12-16 19:18:57 +11:00
Rob Harrington
a40a03905f
Reorganising BMC edit view
2015-12-16 19:18:57 +11:00
Rob Harrington
044e423543
Adding update logic to business model config controller
2015-12-16 19:18:57 +11:00
Rob Harrington
cb9b61f393
WIP: Adding an edit view for BMC variables
2015-12-16 19:18:56 +11:00
