Maikel Linke
d67a5aba0e
Remove script/delayed_job.sh
...
This version was dependent on the Australian environment. It is better
to call delayed_job directly from monit. The deployment repository has
been updated.
2015-12-04 10:37:55 +11:00
Maikel Linke
d5c4da3bf0
Not using Paperclip's to avoid HTTP calls to S3
2015-12-04 10:37:55 +11:00
Maikel Linke
261a464b50
Fixing display of shop list in group producer modal
2015-12-04 10:37:55 +11:00
Maikel Linke
0f2ae79e05
Fixing "Shop for" label on groups producer modal
2015-12-04 10:37:55 +11:00
Maikel Linke
caffdee047
Removing depricated sensor parameter for Google Maps
2015-12-04 10:37:55 +11:00
Rohan Mitchell
d320b2e7d4
Merge branch 'fix-delayed-job' into combined/producer-emails-simplify_fix-delayed-job
2015-12-02 15:06:38 +11:00
Rohan Mitchell
e8ccd35363
Simplify producer email to make it more generic
2015-12-02 15:05:49 +11:00
Rohan Mitchell
bd854bf2dd
Remove receival_time from exchange, just use receival_instructions
2015-12-02 15:05:49 +11:00
Rohan Mitchell
10edb2b056
Fix delayed job startup - prevent error caused by double load
2015-12-02 10:48:50 +11:00
Rob H
86f1afae92
derp
2015-11-29 18:10:49 +11:00
Rob H
1cffd35968
Fixing up specs pertaining to full_name generation for line_items
2015-11-29 17:52:01 +11:00
Rob H
baeacfb8a9
LineItem inherits display_name from variant
...
Allows line_items to be named correctly.
2015-11-29 17:25:28 +11:00
Rob Harrington
7ecf5df26a
Updating line items through admin controller causes enterprise fees to be recalculated
2015-11-27 15:06:49 +11:00
Rob Harrington
a5a886c51f
Only test for coordination when orders actually have order_cycles
2015-11-25 15:27:27 +11:00
Rob Harrington
96aace971f
Merge remote-tracking branch 'origin/master' into line_item_naming
2015-11-25 15:13:56 +11:00
Rob Harrington
6c254c534f
Upgrade fog to resolve 'Digest::Digest is deprecated; use Digest' warning
2015-11-25 15:13:25 +11:00
Rob Harrington
b341c1ef8a
Ensure that dates in BOM AJAX requests have timezones
2015-11-25 15:06:15 +11:00
Rob Harrington
7e6b43266f
Making sure that price and final_weight_volume can be updated (by distributor or coordinator)
2015-11-25 14:23:55 +11:00
Maikel
3975eef0c4
Merge pull request #716 from openfoodfoundation/uk/i18n
...
#715 : Add missing strings for en-GB locale.
2015-11-24 18:36:32 +11:00
Paul Mackay
a2a87cc68f
#715 : Add missing strings for en-GB locale.
2015-11-23 16:44:39 +00:00
Rob Harrington
4bdc1bc418
LineItem final_weight_volume is updated whenever quantity is changed, though can be set directly
2015-11-18 16:22:36 +11:00
Rob Harrington
33454a7090
Adding server validation errors messages to BOM interface
2015-11-18 14:32:29 +11:00
Rob Harrington
6268b7cc7e
Printing/sending an invoice uses the same template for generating a pdf
2015-11-18 10:02:51 +11:00
Rob Harrington
75846a4d1f
Merge branch 'master' into line_item_naming
2015-11-16 10:38:42 +11:00
Rob Harrington
c199e22190
Make a few BOM specs more robust
2015-11-16 10:31:41 +11:00
Rob Harrington
3b2bdb8397
Change the way changes to underlying model are watched and updated for select2 elements
2015-11-16 10:31:22 +11:00
Rob Harrington
767671c3b4
New pattern: blank Options for index drop down filters are added within service
...
Rather than in the controller after data is loaded
2015-11-16 10:30:44 +11:00
Rob Harrington
76414dedff
Bumping coffee-script version
2015-11-16 10:27:32 +11:00
Rob Harrington
ae7fb91a9a
Only reloading line_items and orders on BOM, $timeout for adding blankOption
...
$timeout required for adding a blank option to lists of suppliers,
distributors and orderCycles to prevent spec failures related to the
use of select2
2015-11-13 15:59:33 +11:00
Maikel Linke
229070a76b
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into i18n
2015-11-13 15:20:58 +11:00
Maikel Linke
8bfe459241
i18n fixes of html display
2015-11-13 14:22:17 +11:00
Rohan Mitchell
bb6fb2f5e8
Merge branch 'sell-food-link' into combined/add-to-cart-speed_and_sell-food-link
2015-11-13 14:03:32 +11:00
Rohan Mitchell
6de44877c8
Update link for uber-style sell food dropdown
2015-11-13 14:03:14 +11:00
Rohan Mitchell
b6f3e6eca6
Fix broken spec
2015-11-13 14:03:07 +11:00
Rohan Mitchell
a86cc96452
Use pluck instead of map
2015-11-13 14:03:07 +11:00
Rohan Mitchell
178e5f59e6
Update cart by applying differences rather than clear-and-readd every time
2015-11-13 14:03:07 +11:00
Rohan Mitchell
7fffa03d8d
Fix bug: set difference comparison of string with number
2015-11-13 14:03:07 +11:00
Rohan Mitchell
888e4d80ef
Add reliable way to check if cart is dirty. Previous way returned true when cart empty.
2015-11-13 14:03:07 +11:00
Rohan Mitchell
d3c7c46800
Add method to remove a variant from an order
2015-11-13 14:03:07 +11:00
Rohan Mitchell
c432ed9e08
Build list of variants removed from the cart when overwriting
2015-11-13 14:03:07 +11:00
Rohan Mitchell
e175149e76
Add method to check whether a passed-in cart value varies from the cart
2015-11-13 14:03:07 +11:00
Rohan Mitchell
1b5901317d
Separate concerns: reading products hash and adding items to cart
2015-11-13 14:03:07 +11:00
Rohan Mitchell
2f4b5bad26
Make benchmark more realistic
2015-11-13 14:03:07 +11:00
Rohan Mitchell
64e8927ae9
Add benchmark: add to cart
2015-11-13 14:03:07 +11:00
Rohan Mitchell
c932d20ef5
Extract multi-sample benchmarking into a helper method
2015-11-13 14:03:07 +11:00
Maikel Linke
5d5fda3a25
Merge remote-tracking branch 'origin/master' into i18n
...
Conflicts:
config/locales/en.yml
2015-11-13 10:07:29 +11:00
Rob Harrington
a96cdd5ee7
Merge branch 'master' into line_item_naming
...
Conflicts:
app/views/admin/order_cycles/edit.html.haml
2015-11-13 09:54:26 +11:00
Rob Harrington
4191e2b6f0
Changing the way select filters are reset on BOM to try and fix specs
2015-11-13 09:44:57 +11:00
Rob Harrington
88fd9f72e6
Retry uncooperative BOM feature spec
2015-11-13 09:14:20 +11:00
Rob Harrington
3d36ebe2e6
Some Ransack trickery to get OrderCycles#index to load only recent OR undated OCs when no orders_close_at predicate is passed in
2015-11-12 18:29:19 +11:00
