Rob Harrington
3e9a61a693
Adding js infrastructure to dynamically fetch available payment and shipping methods for accounts distributor
2015-09-17 22:38:08 +10:00
Rob Harrington
e3e59d76a9
Adding global config for setting default payment and shipping methods for accounts distributor
2015-09-17 22:38:08 +10:00
Rob Harrington
65c26296bd
Billable period updater cleans up untouched billable periods for the current billing period
2015-09-17 22:38:08 +10:00
Rob Harrington
9c4ed5f092
Enterprises have billable_periods
2015-09-17 22:38:08 +10:00
Rob Harrington
f0fa696d2f
Default scope for BPs ignores deleted records
2015-09-17 22:38:08 +10:00
Rob Harrington
4d58faefd8
Adding timestamps to billable periods
2015-09-17 22:38:08 +10:00
Rob Harrington
311ffc3dc9
wip: user invoice updater finalizes orders on the first of the month
2015-09-17 22:37:56 +10:00
Rob Harrington
d51c69d353
WIP: User invoice updater adds adjustments to current_invoice for each relevant billable_period
2015-09-17 22:37:56 +10:00
Rob Harrington
ee8a86d495
User model can generate a current invoice for enterprise users
2015-09-17 22:37:56 +10:00
Rob Harrington
fa8c3d65dc
Adding settings for global accounts and billing setup
2015-09-17 22:37:56 +10:00
Rob Harrington
b4e58a1a79
WIP: Basic structure for daily job to update user invoices
2015-09-17 22:37:55 +10:00
Rob Harrington
550434dfe8
Renaming bill_items to billable_periods
2015-09-17 22:37:55 +10:00
Rob Harrington
fc44e57171
Finishing refactor of bill item updater spec
2015-09-17 22:37:45 +10:00
Rob Harrington
77f735c722
WIP: Refactoring bill item updater specs
2015-09-17 22:37:45 +10:00
Rob Harrington
b736e209ca
Bill Item Update handles enterprises created part-way through the month
2015-09-17 22:37:45 +10:00
Rob Harrington
af2bc99c71
Clean up update_bill_items spec after refactor
2015-09-17 22:37:44 +10:00
Rob Harrington
924b3b4cc3
Refactoring update_bill_items job
2015-09-17 22:37:44 +10:00
Rob Harrington
b724745acc
WIP: First take at a nightly job for calculating turnover for enterprises
2015-09-17 22:37:44 +10:00
Rob Harrington
bbe25da117
Adding paper_trail verisoning RSpec helpers
2015-09-17 22:37:44 +10:00
Rob Harrington
77e361dd52
Adding shop_trial_expiry method to enterpise model
2015-09-17 22:37:44 +10:00
Rob Harrington
083d7327bc
Adding BillItem to database
2015-09-17 22:37:44 +10:00
Rob Harrington
2fa217df56
Adding paper_trail to enterprise model, to track changes to owner_id and sells
2015-09-17 22:37:33 +10:00
Rob Harrington
6489848eff
Adding paper_trail gem
2015-09-17 22:37:33 +10:00
sigmundpetersen
b8e40d799b
Added translations
2015-09-17 14:18:09 +02:00
Continuous Integration
205a7f1673
Auto-merge from CI [skip ci]
2015-09-17 09:16:20 +10:00
Maikel Linke
2e591b98e1
remove unused javascript
2015-09-16 16:52:26 +10:00
Maikel Linke
0b4a43d77a
Merge remote-tracking branch 'origin/master' into i18n-replace-strings-in-views
...
Conflicts:
app/views/shared/menu/_cart.html.haml
app/views/spree/order_mailer/confirm_email_for_shop.html.haml
2015-09-16 16:32:16 +10:00
Maikel Linke
ce87ea54cd
Merge branch 'i18n-replace-strings-in-views' of github.com:openfoodfoundation/openfoodnetwork into i18n-replace-strings-in-views
2015-09-16 16:24:38 +10:00
Maikel Linke
637e5c4fee
PermalinkGenerator for products
2015-09-16 15:45:10 +10:00
Maikel Linke
ecca23488d
Merge branch 'ci-handling-git-tags' into combined/deadlock-js-spec_ci-git-tags_product-permalinks
2015-09-16 15:43:13 +10:00
Maikel Linke
2488411b94
JS feature specs completing before cleaning db
...
Some specs ran into a deadlock when the Database::Cleaner tried to do
its job while AJAX requests were still triggering other actions.
2015-09-16 15:38:09 +10:00
Maikel Linke
3f822ed0e3
trying to get rid of intermittent failures
2015-09-16 13:06:32 +10:00
Maikel Linke
33af6cbfb1
Specs pending for lagging JS spec test
2015-09-16 11:24:44 +10:00
Maikel Linke
326c972f63
Handling nil in final_weight_volume calculation
2015-09-16 10:12:59 +10:00
Myriam
11892ffe21
creation of the french translation file
2015-09-14 14:42:37 +02:00
Maikel Linke
10cd654ff5
CI Handling git tags
...
Buildkite is running tags like branches. This caused `git branch`
commands to fail. The function got extended to handle tags as well.
Ideally, Buildkite will offer an option not to rebuild tags.
2015-09-11 15:41:44 +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
47d239ee3a
fix for intermittent capybara click failure
...
This fix might have to be applied at more places. We will see what CI
says...
2015-09-09 17:08:42 +10:00
Maikel Linke
2e2e767564
always displaying group_buy_unit_size
2015-09-09 12:22:28 +10:00
Myriam
3e53decd85
Delete fr.yml
2015-09-04 15:25:53 +02:00
Myriam
4f0e75893e
Create fr.yml
2015-09-04 15:22:19 +02: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
e8ce9feb52
Merge branch 'customers-link' into combined/shopfront_group-buy_customer-contact
2015-09-04 21:48:58 +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
8dffb772dc
Merge branch 'shopfron-validation' into combined/shopfront_group-buy_customer-contact
2015-09-04 21:47:08 +10:00
Maikel Linke
60b2596774
disable max quantity unless min quantity is set
2015-09-04 16:56:51 +10:00
Maikel Linke
6a2af09006
rounding decimal quantities in shopfront
2015-09-04 16:15:02 +10:00
