Rohan Mitchell
|
b71f7eec3d
|
Fix spec for charges by adjustment not shipping method
|
2013-08-13 09:11:26 +10:00 |
|
Rohan Mitchell
|
43f482a803
|
Remove use of deprecated rspec syntax
|
2013-08-13 09:11:26 +10:00 |
|
Rohan Mitchell
|
7677f79f17
|
Remove the now-unused Product#shipping_method_for_distributor
|
2013-08-13 09:11:26 +10:00 |
|
Rohan Mitchell
|
94e49d4190
|
Remove line item specs for removed functionality
|
2013-08-13 09:11:26 +10:00 |
|
Rohan Mitchell
|
7e30b664f2
|
Add enterprise fees relation to enterprise
|
2013-08-13 09:11:26 +10:00 |
|
Rohan Mitchell
|
c011de539d
|
Update rake task for product distribution fees by enterprise fee
|
2013-08-13 09:11:25 +10:00 |
|
Rohan Mitchell
|
b5d324ec8c
|
Drop itemwise shipping method use in tests
|
2013-08-13 09:11:25 +10:00 |
|
Rohan Mitchell
|
9aad44f093
|
Strip shipping method mechanics out of LineItem and Order
|
2013-08-13 09:11:25 +10:00 |
|
Rohan Mitchell
|
60956e9789
|
Display sum of distribution fees at cart by adjustment, not shipping methods
|
2013-08-13 09:11:25 +10:00 |
|
Rohan Mitchell
|
b7ea03f7fc
|
Remove distributor fees table at checkout, pending design of new breakdown
|
2013-08-13 09:11:25 +10:00 |
|
Rohan Mitchell
|
2379cc0c3c
|
Do not display double error when using js
|
2013-08-13 09:11:25 +10:00 |
|
alexs
|
03b36bb14b
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-12 17:35:36 +10:00 |
|
alexs
|
f2f507c5c7
|
Suburb auto-complete functionality for the new landing page.
|
2013-08-12 17:34:56 +10:00 |
|
David Cook
|
c5f0848a56
|
More comments
|
2013-08-12 14:44:27 +10:00 |
|
David Cook
|
03b8b042ba
|
Deleted: libpeerconnection.log
|
2013-08-12 14:44:27 +10:00 |
|
David Cook
|
5baf9938e1
|
Ensure capture shortcut button shows for the correct payment
|
2013-08-12 14:44:26 +10:00 |
|
David Cook
|
c915bb91cf
|
More tests for distributor enterprise user roles
|
2013-08-12 14:44:26 +10:00 |
|
David Cook
|
2ae4efbeba
|
Add more order privileges for distributor enterprise users
|
2013-08-12 14:44:26 +10:00 |
|
David Cook
|
c645ad25a7
|
Add more order privileges for distributor enterprise users
|
2013-08-12 14:44:26 +10:00 |
|
Rohan Mitchell
|
d7cce918f5
|
Instead of protecting shipping methods from destruction when referenced by product distributions, protect enterprise fees
|
2013-08-12 14:22:11 +10:00 |
|
Rohan Mitchell
|
f1485bf9c5
|
Remove shipping method from product distribution in factory.
|
2013-08-12 14:21:39 +10:00 |
|
Rohan Mitchell
|
af6b16ecc4
|
Admin can assign enterprise fees to product distributions
|
2013-08-12 11:05:00 +10:00 |
|
Rohan Mitchell
|
7ea1122833
|
Make spec naming consistent
|
2013-08-12 10:13:31 +10:00 |
|
Rohan Mitchell
|
14268b7be0
|
Create adjustment metadata when creating adjustment
|
2013-08-12 10:00:35 +10:00 |
|
Rohan Mitchell
|
149d48ff5a
|
Add AdjustmentMetadata, for holding info about enterprise fee adjustments at time of creation
|
2013-08-12 10:00:35 +10:00 |
|
Rohan Mitchell
|
ba0b3bad85
|
Convert product distribution shipping methods to enterprise fees
|
2013-08-12 10:00:35 +10:00 |
|
alexs
|
94cab872a5
|
Temporarily removing ssl enforcing.
|
2013-08-11 17:53:53 +10:00 |
|
alexs
|
efc5943f57
|
Increase compression for landing page images.
|
2013-08-11 17:38:25 +10:00 |
|
alexs
|
653525e9b0
|
Updated the spec to reflect the field name change.
|
2013-08-11 17:19:17 +10:00 |
|
alexs
|
e9110ac752
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
Conflicts:
Gemfile.lock
|
2013-08-11 16:59:02 +10:00 |
|
alexs
|
71262d3cb3
|
Base for enterprise search via suburb selector..
|
2013-08-11 16:57:00 +10:00 |
|
alexs
|
51a4795763
|
Added rack-ssl and spinjs.
|
2013-08-11 16:52:34 +10:00 |
|
Rohan Mitchell
|
b065d7db36
|
When updating product distribution charge, skip line items that don't have a product distribution
|
2013-08-09 15:30:35 +10:00 |
|
Rohan Mitchell
|
b84c476348
|
Upgrade Rails to 3.2.14, use forked spree with calculators that are compatible with LineItems
|
2013-08-09 15:30:35 +10:00 |
|
Rohan Mitchell
|
b4a7ccf1b4
|
Adjustments on LineItems don't modify the order total. Make adjustments on Order instead.
|
2013-08-09 15:28:48 +10:00 |
|
Rohan Mitchell
|
513993324d
|
Clean up old adjustments when changing distributor
|
2013-08-09 15:27:52 +10:00 |
|
Rohan Mitchell
|
fd989e3a77
|
Create adjustments so computation is performed against line item. Simplify specs now that weight calculator is compatible with line items.
|
2013-08-09 15:27:52 +10:00 |
|
Rohan Mitchell
|
239dd29511
|
Weight calculator will calculate against a single line item as well as an order
|
2013-08-09 15:27:52 +10:00 |
|
Rohan Mitchell
|
a338c974f8
|
Create line item adjustments for product distributions
|
2013-08-09 15:27:52 +10:00 |
|
Rohan Mitchell
|
8c9a3c8a91
|
Add Product#product_distribution_for
|
2013-08-09 15:26:57 +10:00 |
|
alexs
|
295d86affb
|
Removed the test that is believed to be incorrect and failing build.
|
2013-08-09 14:44:54 +10:00 |
|
alexs
|
834cec48bf
|
Forcing site-wide SSL for production and staging environments.
|
2013-08-09 13:28:58 +10:00 |
|
alexs
|
4ff8e825e9
|
Merge branch 'master' of github.com:eaterprises/openfoodweb
|
2013-08-09 13:21:24 +10:00 |
|
alexs
|
d3ab78e2c6
|
Assets for gmap4rails gem.
|
2013-08-09 13:20:49 +10:00 |
|
alexs
|
b5cc2ab4cf
|
Added postcode search that redirect to page with map view.
|
2013-08-09 13:20:22 +10:00 |
|
alexs
|
39623d45d6
|
Tests for building full addresses.
|
2013-08-09 13:19:07 +10:00 |
|
alexs
|
3b4c02865f
|
Tests for logging in from the new landing page.
|
2013-08-09 13:16:58 +10:00 |
|
alexs
|
7c96c17c88
|
Tests for geo search.
|
2013-08-09 13:15:36 +10:00 |
|
alexs
|
1ca306e09e
|
Added RSpec matchers to test delegations.
|
2013-08-09 13:14:49 +10:00 |
|
Andrew Spinks
|
bc57364c7e
|
Add simple angular cart to the main page.
|
2013-08-08 18:31:56 +10:00 |
|