Will Marshall
|
e92d21ec4e
|
Patching a scoping bug that broke ALL the tests
|
2014-02-27 11:44:36 +11:00 |
|
Will Marshall
|
85606b2a0d
|
Merge branch 'master' into checkout
|
2014-02-27 10:41:39 +11:00 |
|
Will Marshall
|
a0abd9c95a
|
Merge branch 'master' into checkout
|
2014-02-26 15:52:37 +11:00 |
|
Rohan Mitchell
|
f7e1befc75
|
Spec fees_for only sums per-item fees
|
2014-02-26 15:16:30 +11:00 |
|
Will Marshall
|
f5a3167fac
|
Patching up the form and update to get form submission working
|
2014-02-26 15:12:35 +11:00 |
|
Rohan Mitchell
|
11fb6c96a1
|
Charge per-order fees on orders exactly once
|
2014-02-26 14:34:30 +11:00 |
|
Rohan Mitchell
|
b720a1d8f2
|
EnterpriseFee.clear_all_adjustments_on_order clears adjustments from per-order fees
|
2014-02-26 14:33:28 +11:00 |
|
Rohan Mitchell
|
9dec40703a
|
Find exchanges with any of a number of variants
|
2014-02-26 13:49:10 +11:00 |
|
Rohan Mitchell
|
5057e236a9
|
Find enterprise fees with per-order calculators
|
2014-02-26 13:48:51 +11:00 |
|
Rohan Mitchell
|
890af85d30
|
Create per-order adjustments with EnterpriseFeeApplicator
|
2014-02-26 13:28:05 +11:00 |
|
Rohan Mitchell
|
75c8da1774
|
Rename create_adjustments_for to create_line_item_adjustments_for, only show per-item fees
|
2014-02-26 12:07:38 +11:00 |
|
Rohan Mitchell
|
febbe087e9
|
Find EnterpriseFees with per-item calculators
|
2014-02-26 10:39:39 +11:00 |
|
Rohan Mitchell
|
da8a8e8a1a
|
Rename method
|
2014-02-21 15:49:10 +11:00 |
|
Rohan Mitchell
|
08009d4020
|
Extract application of enterprise fees as adjustments into its own class
|
2014-02-21 15:48:58 +11:00 |
|
Will Marshall
|
a162f4a108
|
Adding some spec tweaks
|
2014-02-21 15:17:18 +11:00 |
|
Will Marshall
|
b6b5c2889e
|
Reworking checkout to use f_form_for, show validation, better controller layout
|
2014-02-21 14:31:03 +11:00 |
|
Rohan Mitchell
|
6d1a202800
|
Fix grammar
|
2014-02-19 13:32:57 +11:00 |
|
Rohan Mitchell
|
f88b930137
|
Extract unit_value_with_description into unit_description only when a string starting with a number is provided
|
2014-02-19 13:32:17 +11:00 |
|
Rohan Mitchell
|
acbf1ed680
|
Refactor fragile spec to use has_field? and has_select? in an attempt to make it more reliable in CI
|
2014-02-19 13:12:52 +11:00 |
|
Rohan Mitchell
|
3f9f24157c
|
Do not show unit value or description when product does not have a unit-related option type
|
2014-02-19 12:07:53 +11:00 |
|
Rohan Mitchell
|
3024bbbeb5
|
Edit unit value and description of variant
|
2014-02-19 11:56:37 +11:00 |
|
Rohan Mitchell
|
7b80518621
|
On admin variant edit page, do not show option values for unit-related option types
|
2014-02-19 11:29:26 +11:00 |
|
Will Marshall
|
adb58bc059
|
Moving from @order to current_order to keep DRY
|
2014-02-18 15:07:00 +11:00 |
|
Will Marshall
|
3024007bd3
|
Reworking our page structure to work better with Angular controllers
|
2014-02-18 13:51:39 +11:00 |
|
Rohan Mitchell
|
547f46fbc9
|
Deal with unit_value of zero correctly - do not treat as nil
|
2014-02-18 10:32:36 +11:00 |
|
Will Marshall
|
5c498735b0
|
Moving from new to edit
|
2014-02-14 14:26:31 +11:00 |
|
Will Marshall
|
a722320ece
|
Patching up the tests for new content
|
2014-02-14 13:43:23 +11:00 |
|
Will Marshall
|
3c696b6762
|
Adding payment method switching
|
2014-02-14 13:30:28 +11:00 |
|
Will Marshall
|
25916caeb4
|
Starting on Angular models for Checkout, pretties
|
2014-02-13 16:14:11 +11:00 |
|
Rohan Mitchell
|
701896be95
|
BPE: Add variant and save it to server. Edit the saved variant.
|
2014-02-13 11:52:44 +11:00 |
|
Rohan Mitchell
|
4d24fec6fb
|
BPE: Add a variant. Do not show edit on unsaved variants. Delete unsaved variants.
|
2014-02-13 09:26:07 +11:00 |
|
Rohan Mitchell
|
4aa43cfbe0
|
Set the master unit value for a product without variants
|
2014-02-12 13:57:49 +11:00 |
|
Will Marshall
|
871637c4af
|
NO CAN HAZ EMPTY CART PAGE
|
2014-02-12 12:31:37 +11:00 |
|
Rohan Mitchell
|
b2ad6c7d57
|
Filter products for submit includes master variant
|
2014-02-11 19:23:27 +11:00 |
|
Rohan Mitchell
|
e845c0dc06
|
Remove derived attributes from master variant
|
2014-02-11 19:20:46 +11:00 |
|
Rohan Mitchell
|
0b255ed1e9
|
Pack the master variant before sending to the server
|
2014-02-11 19:19:12 +11:00 |
|
Rohan Mitchell
|
c7c70252d0
|
ofnTrackProduct and ofnTrackVariant accept nested properties as arguments
|
2014-02-11 19:13:11 +11:00 |
|
Will Marshall
|
b11533a629
|
Renaming ShopController to Shop::ShopController
|
2014-02-07 16:52:18 +11:00 |
|
Will Marshall
|
7af1d72ef9
|
Working login and signup forms for checkout, specs, redirect back to checkout on success
|
2014-02-07 16:07:18 +11:00 |
|
Will Marshall
|
63f85fef0e
|
Starting to get in the login stuff
|
2014-02-07 14:34:49 +11:00 |
|
Will Marshall
|
cec0ad8a83
|
Adding ze boilerplate
|
2014-02-07 13:55:25 +11:00 |
|
Will Marshall
|
1ca9a86042
|
Getting in a spec asserting that percentage-based fees are applied
|
2014-02-07 11:09:47 +11:00 |
|
Will Marshall
|
202f95a8fc
|
Fix for broken percentage Enterprise Fees in place, no test yet
|
2014-02-07 11:09:47 +11:00 |
|
Will Marshall
|
b1118735ec
|
One CSS change, adding a test for le price adjustments
|
2014-02-07 11:09:47 +11:00 |
|
Rohan Mitchell
|
aa9b5c84d9
|
Fix expected variant option type name/presentation
|
2014-02-06 16:14:29 +11:00 |
|
Rohan Mitchell
|
f187041606
|
Do not display a space separating units and scaled values. eg. 1kg, 4 boxes
|
2014-02-06 14:05:26 +11:00 |
|
Rohan Mitchell
|
33691085bd
|
Only perform scaling when a scale is present. Fixes items values not saving then loading as infinity.
|
2014-02-06 13:51:08 +11:00 |
|
Rohan Mitchell
|
eccea9d9ff
|
When removing a product's option type, remove its variants' associated option values
|
2014-02-06 10:47:13 +11:00 |
|
Will Marshall
|
f3edd15fa7
|
Switching to using new prices on shop page
|
2014-02-05 14:57:24 +11:00 |
|
Rohan Mitchell
|
d0fd48456e
|
Variant calculates fees and its price inclusive of fees
|
2014-02-05 14:01:10 +11:00 |
|