@@ -655,6 +655,7 @@ discard block |
||
| 655 | 655 | * |
| 656 | 656 | * @param string $code: the name of the step to check |
| 657 | 657 | * @param bool $orIsEqualTo if set to true, this method will return TRUE if the step being checked is the current one |
| 658 | + * @param string $code |
|
| 658 | 659 | * |
| 659 | 660 | * @return bool |
| 660 | 661 | **/ |
@@ -903,7 +904,7 @@ discard block |
||
| 903 | 904 | /** |
| 904 | 905 | * Formatted answer for "hasCustomerMessage". |
| 905 | 906 | * |
| 906 | - * @return string |
|
| 907 | + * @return DBField |
|
| 907 | 908 | */ |
| 908 | 909 | public function ShowAsSummary() |
| 909 | 910 | { |
@@ -913,7 +914,7 @@ discard block |
||
| 913 | 914 | /** |
| 914 | 915 | * |
| 915 | 916 | * |
| 916 | - * @return string |
|
| 917 | + * @return DBField |
|
| 917 | 918 | */ |
| 918 | 919 | public function getShowAsSummary() |
| 919 | 920 | { |
@@ -973,7 +974,7 @@ discard block |
||
| 973 | 974 | /** |
| 974 | 975 | * Formatted answer for "hasCustomerMessage". |
| 975 | 976 | * |
| 976 | - * @return string |
|
| 977 | + * @return DBField |
|
| 977 | 978 | */ |
| 978 | 979 | public function NameAndDescription() |
| 979 | 980 | { |
@@ -61,7 +61,7 @@ |
||
| 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 | private $divider = 3; |
| 28 | 28 | |
| 29 | 29 | /** |
| 30 | - *@return SQLQuery |
|
| 30 | + *@return DataQuery |
|
| 31 | 31 | **/ |
| 32 | 32 | public function apply(DataQuery $query) |
| 33 | 33 | { |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | class OrderFilters_HasBeenCancelled extends ExactMatchFilter |
| 12 | 12 | { |
| 13 | 13 | /** |
| 14 | - *@return SQLQuery |
|
| 14 | + *@return DataQuery |
|
| 15 | 15 | **/ |
| 16 | 16 | public function apply(DataQuery $query) |
| 17 | 17 | { |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | class OrderFilters_MemberAndAddress extends ExactMatchFilter |
| 16 | 16 | { |
| 17 | 17 | /** |
| 18 | - *@return SQLQuery |
|
| 18 | + *@return DataQuery |
|
| 19 | 19 | **/ |
| 20 | 20 | public function apply(DataQuery $query) |
| 21 | 21 | { |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | class OrderFilters_MultiOptionsetStatusIDFilter extends ExactMatchFilter |
| 12 | 12 | { |
| 13 | 13 | /** |
| 14 | - *@return SQLQuery |
|
| 14 | + *@return DataQuery |
|
| 15 | 15 | **/ |
| 16 | 16 | public function apply(DataQuery $query) |
| 17 | 17 | { |
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | class OrderFilters_MustHaveAtLeastOnePayment extends ExactMatchFilter |
| 12 | 12 | { |
| 13 | 13 | /** |
| 14 | - *@return SQLQuery |
|
| 14 | + *@return DataQuery |
|
| 15 | 15 | **/ |
| 16 | 16 | public function apply(DataQuery $query) |
| 17 | 17 | { |
@@ -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 | { |