@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | * @param bool (optional) $b |
195 | 195 | * @param int (optional) $orderID |
196 | 196 | * |
197 | - * @return bool |
|
197 | + * @return boolean|null |
|
198 | 198 | */ |
199 | 199 | public static function set_needs_recalculating($b = true, $orderID = 0) |
200 | 200 | { |
@@ -266,7 +266,7 @@ discard block |
||
266 | 266 | /** |
267 | 267 | * This function returns the OrderSteps. |
268 | 268 | * |
269 | - * @return ArrayList (OrderSteps) |
|
269 | + * @return DataList (OrderSteps) |
|
270 | 270 | **/ |
271 | 271 | public static function get_order_status_options() |
272 | 272 | { |
@@ -465,6 +465,7 @@ discard block |
||
465 | 465 | * link to edit the record. |
466 | 466 | * |
467 | 467 | * @param string | Null $action - e.g. edit |
468 | + * @param string $action |
|
468 | 469 | * |
469 | 470 | * @return string |
470 | 471 | */ |
@@ -1396,7 +1397,7 @@ discard block |
||
1396 | 1397 | * Has the order been paid? |
1397 | 1398 | * TODO: why do we check if there is a total at all? |
1398 | 1399 | * |
1399 | - * @return Boolean (object) |
|
1400 | + * @return DBField (object) |
|
1400 | 1401 | */ |
1401 | 1402 | public function IsPaidNice() |
1402 | 1403 | { |
@@ -1651,7 +1652,7 @@ discard block |
||
1651 | 1652 | * Stores the preferred currency of the order. |
1652 | 1653 | * IMPORTANTLY we store the exchange rate for future reference... |
1653 | 1654 | * |
1654 | - * @param EcommerceCurrency $currency |
|
1655 | + * @param EcommerceCurrency $newCurrency |
|
1655 | 1656 | */ |
1656 | 1657 | public function UpdateCurrency($newCurrency) |
1657 | 1658 | { |
@@ -2112,7 +2113,7 @@ discard block |
||
2112 | 2113 | * @param string|array $excluded - Class(es) of modifier(s) to ignore in the calculation. |
2113 | 2114 | * @param bool $stopAtExcludedModifier - when this flag is TRUE, we stop adding the modifiers when we reach an excluded modifier. |
2114 | 2115 | * |
2115 | - * @return float |
|
2116 | + * @return integer |
|
2116 | 2117 | */ |
2117 | 2118 | public function ModifiersSubTotal($excluded = null, $stopAtExcludedModifier = false) |
2118 | 2119 | { |
@@ -2310,7 +2311,7 @@ discard block |
||
2310 | 2311 | * |
2311 | 2312 | * @param Member (optional) $member |
2312 | 2313 | * |
2313 | - * @return bool |
|
2314 | + * @return boolean|null |
|
2314 | 2315 | **/ |
2315 | 2316 | public function canViewAdminStuff($member = null) |
2316 | 2317 | { |
@@ -2363,7 +2364,7 @@ discard block |
||
2363 | 2364 | * If any of them need immediate attention then this is done |
2364 | 2365 | * first after which it will go through to the checkout page. |
2365 | 2366 | * |
2366 | - * @param Member (optional) $member |
|
2367 | + * @param Member Member $member |
|
2367 | 2368 | * |
2368 | 2369 | * @return bool |
2369 | 2370 | **/ |
@@ -2709,6 +2710,10 @@ discard block |
||
2709 | 2710 | { |
2710 | 2711 | return $this->getTitle($dateFormat, $includeName); |
2711 | 2712 | } |
2713 | + |
|
2714 | + /** |
|
2715 | + * @param string $dateFormat |
|
2716 | + */ |
|
2712 | 2717 | public function getTitle($dateFormat = null, $includeName = false) |
2713 | 2718 | { |
2714 | 2719 | if ($this->exists()) { |
@@ -2772,7 +2777,7 @@ discard block |
||
2772 | 2777 | /** |
2773 | 2778 | * Returns the subtotal of the items for this order. |
2774 | 2779 | * |
2775 | - * @return float |
|
2780 | + * @return integer |
|
2776 | 2781 | */ |
2777 | 2782 | public function SubTotal() |
2778 | 2783 | { |
@@ -2838,7 +2843,7 @@ discard block |
||
2838 | 2843 | /** |
2839 | 2844 | * Returns the total cost of an order including the additional charges or deductions of its modifiers. |
2840 | 2845 | * |
2841 | - * @return float |
|
2846 | + * @return integer |
|
2842 | 2847 | */ |
2843 | 2848 | public function Total() |
2844 | 2849 | { |
@@ -3468,7 +3473,7 @@ discard block |
||
3468 | 3473 | /** |
3469 | 3474 | * Converts the Order into HTML, based on the Order Template. |
3470 | 3475 | * |
3471 | - * @return HTML Object |
|
3476 | + * @return DBField Object |
|
3472 | 3477 | **/ |
3473 | 3478 | public function ConvertToHTML() |
3474 | 3479 | { |
@@ -3532,7 +3537,7 @@ discard block |
||
3532 | 3537 | * In templates, it is used like this: |
3533 | 3538 | * $EcommerceConfigAjax.TableID. |
3534 | 3539 | * |
3535 | - * @return EcommerceConfigAjax |
|
3540 | + * @return EcommerceConfigAjaxDefinitions |
|
3536 | 3541 | **/ |
3537 | 3542 | public function AJAXDefinitions() |
3538 | 3543 | { |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | /** |
47 | 47 | * @param array $data The form request data submitted |
48 | 48 | * @param Form $form The {@link Form} this was submitted on |
49 | - * @param HTTPRequest $request The {@link Form} this was submitted on |
|
49 | + * @param SS_HTTPRequest $request The {@link Form} this was submitted on |
|
50 | 50 | */ |
51 | 51 | public function dofeedback(array $data, Form $form, SS_HTTPRequest $request) |
52 | 52 | { |
@@ -77,7 +77,6 @@ discard block |
||
77 | 77 | /** |
78 | 78 | * saves the form into session. |
79 | 79 | * |
80 | - * @param array $data - data from form. |
|
81 | 80 | */ |
82 | 81 | public function saveDataToSession() |
83 | 82 | { |
@@ -85,6 +84,11 @@ discard block |
||
85 | 84 | Session::set("FormInfo.{$this->FormName()}.data", $data); |
86 | 85 | } |
87 | 86 | |
87 | + /** |
|
88 | + * @param string $value |
|
89 | + * |
|
90 | + * @return string |
|
91 | + */ |
|
88 | 92 | protected function getValueFromOrderConfirmationPage($value) |
89 | 93 | { |
90 | 94 | if($page = $this->getOrderConfirmationPage()) { |
@@ -296,7 +296,6 @@ discard block |
||
296 | 296 | * Return a link to view the order on this page. |
297 | 297 | * |
298 | 298 | * @param int|string $orderID ID of the order |
299 | - * @param string $type - the type of email you want to send. |
|
300 | 299 | * @param bool $actuallySendEmail - do we actually send the email |
301 | 300 | * @param int $alternativeOrderStepID - OrderStep to use |
302 | 301 | * |
@@ -335,7 +334,7 @@ discard block |
||
335 | 334 | * |
336 | 335 | * @param bool $isCurrentStep |
337 | 336 | * |
338 | - * @return Checkout_StepDescription |
|
337 | + * @return CheckoutPage_StepDescription |
|
339 | 338 | */ |
340 | 339 | public function CurrentCheckoutStep($isCurrentStep = false) |
341 | 340 | { |
@@ -687,7 +686,7 @@ discard block |
||
687 | 686 | * checking to see if IsFeedbackEnabled is true |
688 | 687 | * first of all. |
689 | 688 | * |
690 | - * @return OrderForm_Feedback |
|
689 | + * @return OrderConfirmationPage_Controller|null |
|
691 | 690 | */ |
692 | 691 | public function FeedbackForm() |
693 | 692 | { |