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
Maikel Linke
d9b1215a01
Update clicking checkout in spec
2015-09-04 10:54:50 +10:00
sigmundpetersen
e61abb92d2
Create no.yml
2015-09-03 12:16:58 +02:00
Maikel Linke
0895bd8647
Non-integer values cannot be entered into shop front quantities
2015-09-03 17:42:26 +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
Maikel Linke
832f47d6b0
fix i18n typo
2015-09-02 16:58:04 +10:00
Continuous Integration
d3e66bcfa5
Auto-merge from CI [skip ci]
2015-09-02 14:44:05 +10:00
Maikel Linke
415dac3ae3
Updating spec for new Login label
2015-08-28 21:12:56 +10:00
Maikel Linke
8b6f5b4a99
Updating spec for new Login label
2015-08-28 18:37:24 +10:00
Continuous Integration
06010bd8ad
Auto-merge from CI [skip ci]
2015-08-28 17:04:53 +10:00
Maikel Linke
85c99102dd
i18n: Replacing all language strings in app/view/
...
Languages strings were moved to config/locale/en.yml. All views contain
according calls to t() now.
2015-08-28 16:59:23 +10:00
Maikel Linke
1a96ef88bc
Hiding invisible hubs in producer modal
2015-08-28 10:49:36 +10:00
Maikel Linke
d682a29a65
Admin menu contains link to /admin/customers
2015-08-28 10:31:53 +10:00
