@@ -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 | { |
@@ -196,7 +196,7 @@ discard block |
||
196 | 196 | * @param bool (optional) $b |
197 | 197 | * @param int (optional) $orderID |
198 | 198 | * |
199 | - * @return bool |
|
199 | + * @return boolean|null |
|
200 | 200 | */ |
201 | 201 | public static function set_needs_recalculating($b = true, $orderID = 0) |
202 | 202 | { |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | /** |
269 | 269 | * This function returns the OrderSteps. |
270 | 270 | * |
271 | - * @return ArrayList (OrderSteps) |
|
271 | + * @return DataList (OrderSteps) |
|
272 | 272 | **/ |
273 | 273 | public static function get_order_status_options() |
274 | 274 | { |
@@ -467,6 +467,7 @@ discard block |
||
467 | 467 | * link to edit the record. |
468 | 468 | * |
469 | 469 | * @param string | Null $action - e.g. edit |
470 | + * @param string $action |
|
470 | 471 | * |
471 | 472 | * @return string |
472 | 473 | */ |
@@ -1410,7 +1411,7 @@ discard block |
||
1410 | 1411 | * Has the order been paid? |
1411 | 1412 | * TODO: why do we check if there is a total at all? |
1412 | 1413 | * |
1413 | - * @return Boolean (object) |
|
1414 | + * @return DBField (object) |
|
1414 | 1415 | */ |
1415 | 1416 | public function IsPaidNice() |
1416 | 1417 | { |
@@ -1665,7 +1666,7 @@ discard block |
||
1665 | 1666 | * Stores the preferred currency of the order. |
1666 | 1667 | * IMPORTANTLY we store the exchange rate for future reference... |
1667 | 1668 | * |
1668 | - * @param EcommerceCurrency $currency |
|
1669 | + * @param EcommerceCurrency $newCurrency |
|
1669 | 1670 | */ |
1670 | 1671 | public function UpdateCurrency($newCurrency) |
1671 | 1672 | { |
@@ -2126,7 +2127,7 @@ discard block |
||
2126 | 2127 | * @param string|array $excluded - Class(es) of modifier(s) to ignore in the calculation. |
2127 | 2128 | * @param bool $stopAtExcludedModifier - when this flag is TRUE, we stop adding the modifiers when we reach an excluded modifier. |
2128 | 2129 | * |
2129 | - * @return float |
|
2130 | + * @return integer |
|
2130 | 2131 | */ |
2131 | 2132 | public function ModifiersSubTotal($excluded = null, $stopAtExcludedModifier = false) |
2132 | 2133 | { |
@@ -2324,7 +2325,7 @@ discard block |
||
2324 | 2325 | * |
2325 | 2326 | * @param Member (optional) $member |
2326 | 2327 | * |
2327 | - * @return bool |
|
2328 | + * @return boolean|null |
|
2328 | 2329 | **/ |
2329 | 2330 | public function canViewAdminStuff($member = null) |
2330 | 2331 | { |
@@ -2377,7 +2378,7 @@ discard block |
||
2377 | 2378 | * If any of them need immediate attention then this is done |
2378 | 2379 | * first after which it will go through to the checkout page. |
2379 | 2380 | * |
2380 | - * @param Member (optional) $member |
|
2381 | + * @param Member Member $member |
|
2381 | 2382 | * |
2382 | 2383 | * @return bool |
2383 | 2384 | **/ |
@@ -2744,6 +2745,10 @@ discard block |
||
2744 | 2745 | { |
2745 | 2746 | return $this->getTitle($dateFormat, $includeName); |
2746 | 2747 | } |
2748 | + |
|
2749 | + /** |
|
2750 | + * @param string $dateFormat |
|
2751 | + */ |
|
2747 | 2752 | public function getTitle($dateFormat = null, $includeName = false) |
2748 | 2753 | { |
2749 | 2754 | if ($this->exists()) { |
@@ -2807,7 +2812,7 @@ discard block |
||
2807 | 2812 | /** |
2808 | 2813 | * Returns the subtotal of the items for this order. |
2809 | 2814 | * |
2810 | - * @return float |
|
2815 | + * @return integer |
|
2811 | 2816 | */ |
2812 | 2817 | public function SubTotal() |
2813 | 2818 | { |
@@ -2873,7 +2878,7 @@ discard block |
||
2873 | 2878 | /** |
2874 | 2879 | * Returns the total cost of an order including the additional charges or deductions of its modifiers. |
2875 | 2880 | * |
2876 | - * @return float |
|
2881 | + * @return integer |
|
2877 | 2882 | */ |
2878 | 2883 | public function Total() |
2879 | 2884 | { |
@@ -3338,7 +3343,7 @@ discard block |
||
3338 | 3343 | /** |
3339 | 3344 | * Submission Log for this Order (if any). |
3340 | 3345 | * |
3341 | - * @return DateTime |
|
3346 | + * @return DBField |
|
3342 | 3347 | **/ |
3343 | 3348 | public function OrderDate() |
3344 | 3349 | { |
@@ -3520,7 +3525,7 @@ discard block |
||
3520 | 3525 | /** |
3521 | 3526 | * Converts the Order into HTML, based on the Order Template. |
3522 | 3527 | * |
3523 | - * @return HTML Object |
|
3528 | + * @return DBField Object |
|
3524 | 3529 | **/ |
3525 | 3530 | public function ConvertToHTML() |
3526 | 3531 | { |
@@ -3584,7 +3589,7 @@ discard block |
||
3584 | 3589 | * In templates, it is used like this: |
3585 | 3590 | * $EcommerceConfigAjax.TableID. |
3586 | 3591 | * |
3587 | - * @return EcommerceConfigAjax |
|
3592 | + * @return EcommerceConfigAjaxDefinitions |
|
3588 | 3593 | **/ |
3589 | 3594 | public function AJAXDefinitions() |
3590 | 3595 | { |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | * If the order already exists, it will update the seconds and the creation time. |
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 | { |
@@ -230,7 +230,7 @@ discard block |
||
230 | 230 | * |
231 | 231 | * @param Order $order |
232 | 232 | * |
233 | - * @return null | OrderProcessQueue |
|
233 | + * @return DataObject|null | OrderProcessQueue |
|
234 | 234 | */ |
235 | 235 | public function getQueueObject($order) |
236 | 236 | { |
@@ -287,7 +287,6 @@ discard block |
||
287 | 287 | |
288 | 288 | /** |
289 | 289 | * META METHOD: all orders with a queue object |
290 | - * @param int $id force this Order to be processed |
|
291 | 290 | * @param int $limit total number of orders that can be retrieved at any one time |
292 | 291 | * |
293 | 292 | * @return DataList (of orders) |