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
Maikel Linke
ced254919a
Updating JS spec
2015-08-27 14:54:46 +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
Maikel Linke
5d34b711e9
Handling undefined customer tags
2015-08-26 15:01:20 +10:00
Maikel Linke
4f7f2e2035
Displaying customer tags
2015-08-26 10:14:03 +10:00
Continuous Integration
d595e1558a
Auto-merge from CI [skip ci]
2015-08-26 10:03:13 +10:00
Maikel Linke
5ccae9cfab
Redirecting /products/:id to /
2015-08-21 15:18:31 +10:00
Maikel Linke
adc20e9e4e
Handling tax categories without tax rates
2015-08-21 15:16:00 +10:00
Continuous Integration
03627e2ef2
Auto-merge from CI [skip ci]
2015-08-21 13:41:02 +10:00
Rohan Mitchell
3e5028b6b9
Revise lettuceshare report - combine grower and cert cols, add column headings
2015-08-16 11:06:52 +08: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
170799f65f
Add permission for hub enterprise users to use xero report #628
2015-08-07 13:37:37 +10:00
Rohan Mitchell
9e1788a6b0
Apply migrations to db/schema.rb
2015-08-07 12:03:43 +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
Rohan Mitchell
3eea002a0c
Put rspec-retry on flaky specs
2015-08-07 11:06:16 +10:00
Rohan Mitchell
6f4dc6943e
Add first cut of LettuceShare report
2015-08-07 10:37:59 +10:00
Rohan Mitchell
e75b595b97
Tidy syntax
2015-08-07 10:37:59 +10:00
Rohan Mitchell
af04c61528
Add rspec-retry for intermittently failing spec
2015-08-05 13:35:53 +10:00
