@@ -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); |
@@ -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 | { |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | * META METHOD: Add an order to the job list if it does not exist already. |
153 | 153 | * |
154 | 154 | * @param Order $order |
155 | - * @param Int $deferInSeconds |
|
155 | + * @param Int $deferTimeInSeconds |
|
156 | 156 | */ |
157 | 157 | public function AddOrderToQueue($order, $deferTimeInSeconds) |
158 | 158 | { |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | * |
185 | 185 | * |
186 | 186 | * @param Order $order optional |
187 | - * @return boolean | string |
|
187 | + * @return boolean|string | string |
|
188 | 188 | */ |
189 | 189 | public function process($order = null) |
190 | 190 | { |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | * |
245 | 245 | * @param Order $order |
246 | 246 | * |
247 | - * @return null | OrderProcessQueue |
|
247 | + * @return DataObject | OrderProcessQueue |
|
248 | 248 | */ |
249 | 249 | public function getQueueObject($order) |
250 | 250 | { |
@@ -301,7 +301,6 @@ discard block |
||
301 | 301 | |
302 | 302 | /** |
303 | 303 | * META METHOD: all orders with a queue object |
304 | - * @param int $id force this Order to be processed |
|
305 | 304 | * @param int $limit total number of orders that can be retrieved at any one time |
306 | 305 | * |
307 | 306 | * @return DataList (of orders) |
@@ -467,7 +466,7 @@ discard block |
||
467 | 466 | |
468 | 467 | /** |
469 | 468 | * sort phrase for orders, based in order IDs... |
470 | - * @param array $orderIds |
|
469 | + * @param array $orderIDs |
|
471 | 470 | * @return string |
472 | 471 | */ |
473 | 472 | protected function sortPhraseForOrderIDs($orderIDs) |
@@ -100,6 +100,11 @@ |
||
100 | 100 | } |
101 | 101 | } |
102 | 102 | |
103 | + /** |
|
104 | + * @param DataObject $lastOrderStep |
|
105 | + * @param string $orderStatusLogClassName |
|
106 | + * @param integer $offset |
|
107 | + */ |
|
103 | 108 | public function getOrdersForCreateSubmissionLogForArchivedOrders($lastOrderStep, $orderStatusLogClassName, $offset) |
104 | 109 | { |
105 | 110 | return Order::get() |