@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | * |
31 | 31 | * @see Order::doNextStatus |
32 | 32 | * |
33 | - * @param Order object |
|
33 | + * @param Order Order |
|
34 | 34 | * |
35 | 35 | * @return bool - true if the current step is ready to be run... |
36 | 36 | **/ |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | * |
48 | 48 | * @see Order::doNextStatus |
49 | 49 | * |
50 | - * @param Order object |
|
50 | + * @param Order Order |
|
51 | 51 | * |
52 | 52 | * @return bool - true if run correctly. |
53 | 53 | **/ |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | * |
62 | 62 | * @param DataObject $order Order |
63 | 63 | * |
64 | - * @return DataObject | Null - DataObject = OrderStep |
|
64 | + * @return OrderStep|null | Null - DataObject = OrderStep |
|
65 | 65 | **/ |
66 | 66 | public function nextStep(Order $order) |
67 | 67 | { |
@@ -27,7 +27,7 @@ |
||
27 | 27 | * |
28 | 28 | * @see Order::doNextStatus |
29 | 29 | * |
30 | - * @param Order object |
|
30 | + * @param Order Order |
|
31 | 31 | * |
32 | 32 | * @return bool - true if the current step is ready to be run... |
33 | 33 | **/ |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | * |
27 | 27 | * @see Order::doNextStatus |
28 | 28 | * |
29 | - * @param Order object |
|
29 | + * @param Order Order |
|
30 | 30 | * |
31 | 31 | * @return bool - true if the current step is ready to be run... |
32 | 32 | **/ |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | * |
44 | 44 | * @see Order::doNextStatus |
45 | 45 | * |
46 | - * @param Order object |
|
46 | + * @param Order Order |
|
47 | 47 | * |
48 | 48 | * @return bool - true if run correctly. |
49 | 49 | **/ |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | * |
49 | 49 | * @see Order::doNextStatus |
50 | 50 | * |
51 | - * @param Order object |
|
51 | + * @param Order Order |
|
52 | 52 | * |
53 | 53 | * @return bool - true if the current step is ready to be run... |
54 | 54 | **/ |
@@ -65,9 +65,9 @@ discard block |
||
65 | 65 | * |
66 | 66 | * @see Order::doNextStatus |
67 | 67 | * |
68 | - * @param Order object |
|
68 | + * @param Order Order |
|
69 | 69 | * |
70 | - * @return bool - true if run correctly. |
|
70 | + * @return boolean|null - true if run correctly. |
|
71 | 71 | **/ |
72 | 72 | public function doStep(Order $order) |
73 | 73 | { |
@@ -41,7 +41,7 @@ |
||
41 | 41 | * NOTE: must have a payment (even if it is a fake payment). |
42 | 42 | * The reason for this is if people pay straight away then they want to see the payment shown on their invoice. |
43 | 43 | * |
44 | - * @param Order object |
|
44 | + * @param Order Order |
|
45 | 45 | * |
46 | 46 | * @return bool - true if the current step is ready to be run... |
47 | 47 | **/ |
@@ -43,7 +43,7 @@ |
||
43 | 43 | * |
44 | 44 | * @see Order::doNextStatus |
45 | 45 | * |
46 | - * @param Order object |
|
46 | + * @param Order Order |
|
47 | 47 | * |
48 | 48 | * @return bool - true if the current step is ready to be run... |
49 | 49 | **/ |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | * |
56 | 56 | * @see Order::doNextStatus |
57 | 57 | * |
58 | - * @param Order object |
|
58 | + * @param Order Order |
|
59 | 59 | * |
60 | 60 | * @return bool - true if the current step is ready to be run... |
61 | 61 | **/ |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | /** |
68 | 68 | * Add a member to the order - in case he / she is not a shop admin. |
69 | 69 | * |
70 | - * @param Order object |
|
70 | + * @param Order Order |
|
71 | 71 | * |
72 | 72 | * @return bool - true if run correctly. |
73 | 73 | **/ |
@@ -253,7 +253,6 @@ discard block |
||
253 | 253 | * Return a link to view the order on this page. |
254 | 254 | * |
255 | 255 | * @param int|string $orderID ID of the order |
256 | - * @param string $type - the type of email you want to send. |
|
257 | 256 | * @param bool $actuallySendEmail - do we actually send the email |
258 | 257 | * @param int $alternativeOrderStepID - OrderStep to use |
259 | 258 | * |
@@ -290,7 +289,7 @@ discard block |
||
290 | 289 | * |
291 | 290 | * @param bool $isCurrentStep |
292 | 291 | * |
293 | - * @return Checkout_StepDescription |
|
292 | + * @return CheckoutPage_StepDescription |
|
294 | 293 | */ |
295 | 294 | public function CurrentCheckoutStep($isCurrentStep = false) |
296 | 295 | { |
@@ -322,7 +322,7 @@ discard block |
||
322 | 322 | /** |
323 | 323 | * Used in getCSMFields. |
324 | 324 | * |
325 | - * @return GridField |
|
325 | + * @return UploadField |
|
326 | 326 | **/ |
327 | 327 | protected function getAdditionalImagesField() |
328 | 328 | { |
@@ -337,7 +337,7 @@ discard block |
||
337 | 337 | /** |
338 | 338 | * Used in getCSMFields. |
339 | 339 | * |
340 | - * @return GridField |
|
340 | + * @return UploadField |
|
341 | 341 | **/ |
342 | 342 | protected function getAdditionalFilesField() |
343 | 343 | { |
@@ -626,7 +626,7 @@ discard block |
||
626 | 626 | /** |
627 | 627 | * returns the default image of the product. |
628 | 628 | * |
629 | - * @return Image | Null |
|
629 | + * @return string | Null |
|
630 | 630 | */ |
631 | 631 | public function DefaultImage() |
632 | 632 | { |
@@ -661,7 +661,7 @@ discard block |
||
661 | 661 | /** |
662 | 662 | * @TODO: complete |
663 | 663 | * |
664 | - * @param string $compontent - the has many relationship you are looking at, e.g. OrderAttribute |
|
664 | + * @param string $component - the has many relationship you are looking at, e.g. OrderAttribute |
|
665 | 665 | * |
666 | 666 | * @return DataList (CHECK!) |
667 | 667 | */ |
@@ -752,7 +752,7 @@ discard block |
||
752 | 752 | /** |
753 | 753 | * You can set an alternative class name for order item using this method. |
754 | 754 | * |
755 | - * @param string $ClassName |
|
755 | + * @param string $className |
|
756 | 756 | **/ |
757 | 757 | public function setAlternativeClassNameForOrderItem($className) |
758 | 758 | { |
@@ -879,6 +879,7 @@ discard block |
||
879 | 879 | * set new specific new quantity for buyable's orderitem. |
880 | 880 | * |
881 | 881 | * @param float |
882 | + * @param integer $quantity |
|
882 | 883 | * |
883 | 884 | * @return string (Link) |
884 | 885 | */ |
@@ -970,7 +971,7 @@ discard block |
||
970 | 971 | * In templates, it is used like this: |
971 | 972 | * $EcommerceConfigAjax.TableID. |
972 | 973 | * |
973 | - * @return EcommerceConfigAjax |
|
974 | + * @return EcommerceConfigAjaxDefinitions |
|
974 | 975 | **/ |
975 | 976 | public function AJAXDefinitions() |
976 | 977 | { |
@@ -1023,6 +1024,9 @@ discard block |
||
1023 | 1024 | |
1024 | 1025 | private static $_calculated_price_cache = array(); |
1025 | 1026 | |
1027 | + /** |
|
1028 | + * @return double |
|
1029 | + */ |
|
1026 | 1030 | public function getCalculatedPrice() |
1027 | 1031 | { |
1028 | 1032 | if (! isset(self::$_calculated_price_cache[$this->ID])) { |