@@ -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 | { |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | * |
25 | 25 | * @see Order::doNextStatus |
26 | 26 | * |
27 | - * @param Order object |
|
27 | + * @param Order Order |
|
28 | 28 | * |
29 | 29 | * @return bool - true if the current step is ready to be run... |
30 | 30 | **/ |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * |
42 | 42 | * @see Order::doNextStatus |
43 | 43 | * |
44 | - * @param Order object |
|
44 | + * @param Order Order |
|
45 | 45 | * |
46 | 46 | * @return bool - true if run correctly. |
47 | 47 | **/ |
@@ -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 | **/ |
@@ -96,6 +96,11 @@ |
||
96 | 96 | } |
97 | 97 | |
98 | 98 | |
99 | + /** |
|
100 | + * @param DataList $orders |
|
101 | + * @param integer|null $limit |
|
102 | + * @param integer|null $startAt |
|
103 | + */ |
|
99 | 104 | protected function tryToFinaliseOrders($orders, $limit, $startAt) |
100 | 105 | { |
101 | 106 | $orders = $orders->limit($limit, $startAt); |
@@ -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 | { |