Rohan Mitchell
ef603a070e
Add methods to check for novel suppliers and distributors in an order cycle
2015-12-10 09:17:25 +11:00
Rohan Mitchell
1a4448c6d2
Do not allow adding blank enterprises
2015-12-10 09:17:25 +11:00
Rohan Mitchell
a78d8fa6af
Build exchange form on front-end
2015-12-10 09:17:25 +11:00
Rohan Mitchell
8c0a82f26f
Provide issues summary for enterprises, pass enterprises through to controller
2015-12-10 09:17:25 +11:00
Rohan Mitchell
93c42d24c7
Extract issue detection into service object
2015-12-10 09:17:25 +11:00
Rohan Mitchell
036ffeb634
Enterprise service splits enterprises into hubs and producers
2015-12-10 09:17:25 +11:00
Rohan Mitchell
3dcbdad088
Show/hide all products
2015-12-10 09:17:25 +11:00
Rohan Mitchell
7820c31976
Show supplier as secondary in information hierarchy
2015-12-10 09:17:25 +11:00
Rohan Mitchell
d314f07887
Use flexbox to more neatly lay out order cycle products
2015-12-10 09:17:25 +11:00
Rohan Mitchell
2efaedc225
Add .exchange-products container div, fill full row with products
2015-12-10 09:17:25 +11:00
Rohan Mitchell
c5e2ed5aa1
Order outgoing products by name
2015-12-10 09:17:24 +11:00
Rohan Mitchell
8f917817b8
Fix broken styles
2015-12-10 09:17:24 +11:00
Rohan Mitchell
a2c0088c91
Do not show flash message if we're performing an async update without reload
2015-12-10 09:17:24 +11:00
Rohan Mitchell
9fef0a9909
When order cycle is updated, display message instead of reloading the page
2015-12-10 09:17:24 +11:00
Rohan Mitchell
29bfac5f54
Order cycle interface may update or update and close
2015-12-10 09:17:24 +11:00
Maikel Linke
efa7c215e2
Removing usage of SimpleCov
2015-12-04 14:51:44 +11:00
Maikel Linke
1589bd9ac3
Use mail() instead of devise_mail
...
The EnterpriseMailer used `devise_mail` to send confirmation
instructions. That call is more complicated than `mail` and added an
unwanted reply-to header.
2015-12-04 10:37:55 +11:00
Maikel Linke
a810a6e2b7
fix succeed_if_master_merged
2015-12-04 10:37:55 +11:00
Maikel Linke
c4fb4a8510
Removing Suburbs from the code
...
Suburbs are not used any more. Removing the last code bits should avoid
confusion and save a tiny bit of test time.
2015-12-04 10:37:55 +11:00
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
