Will Marshall
|
17f09d1852
|
Adding primary taxon field to product
|
2014-05-24 09:29:19 +10:00 |
|
Rohan Mitchell
|
ad1f852bdd
|
Revert "Adding primary taxon field to product"
This reverts commit fd1e7ebaa3.
|
2014-05-24 09:07:57 +10:00 |
|
Will Marshall
|
fd1e7ebaa3
|
Adding primary taxon field to product
|
2014-05-23 15:59:06 +10:00 |
|
Rohan Mitchell
|
9b15c213d1
|
When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges
|
2014-05-23 11:28:00 +10:00 |
|
Rohan Mitchell
|
d7b4318aff
|
Find enterprise relationships involving any of a number of enterprises
|
2014-05-22 11:25:37 +10:00 |
|
Rohan Mitchell
|
f6bc1a82be
|
Enterprise user can manage enterprise relationships
|
2014-05-22 10:54:51 +10:00 |
|
Rohan Mitchell
|
e40843bccb
|
Allow error messages without attribute name. Improve enterprise relationship error message.
|
2014-05-21 11:29:11 +10:00 |
|
Rohan Mitchell
|
1a854b89ec
|
Sort enterprise relationships by enterprise name
|
2014-05-21 11:29:11 +10:00 |
|
Will Marshall
|
61cf35a5b9
|
Adding attr_accessors and paperclip file uploads
|
2014-05-20 12:18:28 +10:00 |
|
Will Marshall
|
0958602418
|
Starting on migrations and admin forms
|
2014-05-20 12:18:27 +10:00 |
|
Will Marshall
|
9f169e6ef8
|
Adding a basic stub of the primary taxon
|
2014-05-16 10:23:31 +10:00 |
|
Will Marshall
|
eae12da24a
|
Adding distributors display to producers page
|
2014-05-15 12:20:17 +10:00 |
|
Will Marshall
|
575ce9fe01
|
Adding producers to home and distributors to producers
|
2014-05-15 12:02:58 +10:00 |
|
Rohan Mitchell
|
6c5172c567
|
Add EnterpriseRelationship. An Enterprise can find its relatives.
|
2014-05-14 15:50:25 +10:00 |
|
Rob H
|
fe5d015778
|
Merging in master
|
2014-05-07 13:07:11 +10:00 |
|
Rob H
|
ceada3596b
|
Merge master into cleanup
|
2014-05-02 14:43:06 +10:00 |
|
Rohan Mitchell
|
4480c75494
|
Fix "undefined method 'association_class' for nil:NilClass" error when creating Migs payment gateway
|
2014-05-02 14:25:32 +10:00 |
|
Rohan Mitchell
|
c9aefa507a
|
Remove chili
|
2014-05-02 14:25:32 +10:00 |
|
Rob H
|
de369ae32b
|
WIP: Can manage taxons in BPE
|
2014-05-02 10:28:33 +10:00 |
|
Will Marshall
|
f68a637609
|
Renaming Enterprise.active to Enterprise.visible
|
2014-04-30 12:09:22 +10:00 |
|
Will Marshall
|
563976c084
|
Adding an active scope and test to Enterprise
|
2014-04-30 12:02:11 +10:00 |
|
Will Marshall
|
c33fa03736
|
Merging into master
|
2014-04-29 10:35:05 +10:00 |
|
Rohan Mitchell
|
91d9b546d2
|
Merge branch 'foreign-keys'
|
2014-04-25 16:06:54 +10:00 |
|
Will Marshall
|
cf67b5fcac
|
Adding a taxon collection mechanism to Enterprise
|
2014-04-25 12:45:03 +10:00 |
|
Rohan Mitchell
|
85db8859bb
|
On admin order cycle edit page, do not show exchanges for enterprises the user doesn't manage
|
2014-04-24 15:51:39 +10:00 |
|
Rohan Mitchell
|
d0585b4d05
|
Admin order cycle listing does not show order cycles that enterprise users don't have access to
|
2014-04-24 14:43:33 +10:00 |
|
Rohan Mitchell
|
3c8757034a
|
Enterprise user can soft-delete a variant. BUT, only its own variants.
|
2014-04-24 13:20:16 +10:00 |
|
Rohan Mitchell
|
4cbe434573
|
Remove trailing relations on destruction for EnterpriseFee and Variant
|
2014-04-24 13:20:15 +10:00 |
|
Will Marshall
|
0479a0a55d
|
Fixing bugs, improving dates
|
2014-04-23 15:46:14 +10:00 |
|
Rob H
|
b37a701d39
|
Merge branch 'api_fixes' into bom
|
2014-04-23 12:03:01 +10:00 |
|
Rob H
|
5345e8d339
|
Add accessible_by scope to enterprises model and accessible action to enterprises API
|
2014-04-17 12:23:09 +10:00 |
|
Rob H
|
20a5278a75
|
Merge branch 'master' into bom
|
2014-04-17 09:23:08 +10:00 |
|
Will Marshall
|
171c8c6ed1
|
Merging in with master
|
2014-04-16 16:16:15 +10:00 |
|
Rob H
|
2b283405e7
|
Only admin and users of distributors can access admin orders
|
2014-04-13 10:09:17 +10:00 |
|
Rohan Mitchell
|
8ad7cac639
|
Do not need to protect here, since we're clearing all unit option values earlier in this method
|
2014-04-11 19:08:55 +10:00 |
|
Rohan Mitchell
|
47ac097eb7
|
Do not show deleted variants on shopfront
|
2014-04-11 19:08:55 +10:00 |
|
Will Marshall
|
9cb56c61ae
|
Patching a bug in which carts get emptied
|
2014-04-11 17:32:39 +10:00 |
|
Will Marshall
|
2e0485c064
|
Getting the entire order into localStorage: one bug with radio boxes
|
2014-04-11 17:24:32 +10:00 |
|
Rob H
|
e114aecfd0
|
Merge branch 'master' into bom
|
2014-04-10 16:30:13 +10:00 |
|
Will Marshall
|
093004a460
|
Clearing the cart when order cycle is changed
|
2014-04-09 15:40:41 +10:00 |
|
Rohan Mitchell
|
a91ea933cc
|
Destroy adjustment metadata when adjustment is destroyed
|
2014-04-09 15:02:41 +10:00 |
|
Will Marshall
|
5c999fd9cf
|
Adding a signup confirmation email
|
2014-04-04 12:36:33 +13:00 |
|
Rob H
|
8e54bf1e2e
|
Enterprise users are aurthorised to view BOM
|
2014-04-04 09:11:56 +11:00 |
|
Rohan Mitchell
|
32ffd05ba0
|
Order cycle can have the same enterprise participating as supplier, coordinator and distributor
|
2014-04-02 11:54:28 +11:00 |
|
Rohan Mitchell
|
da6ba04780
|
Update variant weight from unit value when unit is weight
|
2014-03-28 15:34:26 +11:00 |
|
Rohan Mitchell
|
71273dfc7f
|
Refactor Product to use exchanges.incoming instead of sender/receiver roles
|
2014-03-26 16:36:09 +11:00 |
|
Rohan Mitchell
|
20745825bf
|
Fix finding producers for shopfront, moving to SQL-land in the process. Woo.
|
2014-03-26 12:56:58 +11:00 |
|
Rohan Mitchell
|
abf83b0e58
|
Find only outgoing exchanges for Enterprise scopes using with_order_cycles_outer
|
2014-03-26 12:07:06 +11:00 |
|
Rohan Mitchell
|
f184f0c246
|
Fix inappropriate intimacy: Extract exchange-specific queries from OrderCycle back into exchange
|
2014-03-26 11:43:32 +11:00 |
|
Rohan Mitchell
|
ac92d0919a
|
Add incoming boolean field to Exchange, determine exchange direction from this field rather than sender/receiver roles
|
2014-03-26 11:19:35 +11:00 |
|