@@ -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); |
@@ -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() |
@@ -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 | */ |
@@ -1680,7 +1681,7 @@ discard block |
||
| 1680 | 1681 | * Stores the preferred currency of the order. |
| 1681 | 1682 | * IMPORTANTLY we store the exchange rate for future reference... |
| 1682 | 1683 | * |
| 1683 | - * @param EcommerceCurrency $currency |
|
| 1684 | + * @param EcommerceCurrency $newCurrency |
|
| 1684 | 1685 | */ |
| 1685 | 1686 | public function UpdateCurrency($newCurrency) |
| 1686 | 1687 | { |
@@ -2141,7 +2142,7 @@ discard block |
||
| 2141 | 2142 | * @param string|array $excluded - Class(es) of modifier(s) to ignore in the calculation. |
| 2142 | 2143 | * @param bool $stopAtExcludedModifier - when this flag is TRUE, we stop adding the modifiers when we reach an excluded modifier. |
| 2143 | 2144 | * |
| 2144 | - * @return float |
|
| 2145 | + * @return integer |
|
| 2145 | 2146 | */ |
| 2146 | 2147 | public function ModifiersSubTotal($excluded = null, $stopAtExcludedModifier = false) |
| 2147 | 2148 | { |
@@ -2339,7 +2340,7 @@ discard block |
||
| 2339 | 2340 | * |
| 2340 | 2341 | * @param Member (optional) $member |
| 2341 | 2342 | * |
| 2342 | - * @return bool |
|
| 2343 | + * @return boolean|null |
|
| 2343 | 2344 | **/ |
| 2344 | 2345 | public function canViewAdminStuff($member = null) |
| 2345 | 2346 | { |
@@ -2392,7 +2393,7 @@ discard block |
||
| 2392 | 2393 | * If any of them need immediate attention then this is done |
| 2393 | 2394 | * first after which it will go through to the checkout page. |
| 2394 | 2395 | * |
| 2395 | - * @param Member (optional) $member |
|
| 2396 | + * @param Member Member $member |
|
| 2396 | 2397 | * |
| 2397 | 2398 | * @return bool |
| 2398 | 2399 | **/ |
@@ -2759,6 +2760,10 @@ discard block |
||
| 2759 | 2760 | { |
| 2760 | 2761 | return $this->getTitle($dateFormat, $includeName); |
| 2761 | 2762 | } |
| 2763 | + |
|
| 2764 | + /** |
|
| 2765 | + * @param string $dateFormat |
|
| 2766 | + */ |
|
| 2762 | 2767 | public function getTitle($dateFormat = null, $includeName = false) |
| 2763 | 2768 | { |
| 2764 | 2769 | if ($this->exists()) { |
@@ -2822,7 +2827,7 @@ discard block |
||
| 2822 | 2827 | /** |
| 2823 | 2828 | * Returns the subtotal of the items for this order. |
| 2824 | 2829 | * |
| 2825 | - * @return float |
|
| 2830 | + * @return integer |
|
| 2826 | 2831 | */ |
| 2827 | 2832 | public function SubTotal() |
| 2828 | 2833 | { |
@@ -2888,7 +2893,7 @@ discard block |
||
| 2888 | 2893 | /** |
| 2889 | 2894 | * Returns the total cost of an order including the additional charges or deductions of its modifiers. |
| 2890 | 2895 | * |
| 2891 | - * @return float |
|
| 2896 | + * @return integer |
|
| 2892 | 2897 | */ |
| 2893 | 2898 | public function Total() |
| 2894 | 2899 | { |
@@ -3353,7 +3358,7 @@ discard block |
||
| 3353 | 3358 | /** |
| 3354 | 3359 | * Submission Log for this Order (if any). |
| 3355 | 3360 | * |
| 3356 | - * @return DateTime |
|
| 3361 | + * @return DBField |
|
| 3357 | 3362 | **/ |
| 3358 | 3363 | public function OrderDate() |
| 3359 | 3364 | { |
@@ -3538,7 +3543,7 @@ discard block |
||
| 3538 | 3543 | /** |
| 3539 | 3544 | * Converts the Order into HTML, based on the Order Template. |
| 3540 | 3545 | * |
| 3541 | - * @return HTML Object |
|
| 3546 | + * @return DBField Object |
|
| 3542 | 3547 | **/ |
| 3543 | 3548 | public function ConvertToHTML() |
| 3544 | 3549 | { |
@@ -3602,7 +3607,7 @@ discard block |
||
| 3602 | 3607 | * In templates, it is used like this: |
| 3603 | 3608 | * $EcommerceConfigAjax.TableID. |
| 3604 | 3609 | * |
| 3605 | - * @return EcommerceConfigAjax |
|
| 3610 | + * @return EcommerceConfigAjaxDefinitions |
|
| 3606 | 3611 | **/ |
| 3607 | 3612 | public function AJAXDefinitions() |
| 3608 | 3613 | { |
@@ -300,7 +300,7 @@ discard block |
||
| 300 | 300 | * standard SS method. |
| 301 | 301 | * |
| 302 | 302 | * @param BuyableModel $buyable |
| 303 | - * @param float $quantity |
|
| 303 | + * @param integer $quantity |
|
| 304 | 304 | * |
| 305 | 305 | * @return FieldList |
| 306 | 306 | **/ |
@@ -580,7 +580,7 @@ discard block |
||
| 580 | 580 | } |
| 581 | 581 | |
| 582 | 582 | /** |
| 583 | - * @return Field (EcomQuantityField) |
|
| 583 | + * @return EcomQuantityField (EcomQuantityField) |
|
| 584 | 584 | **/ |
| 585 | 585 | public function QuantityField() |
| 586 | 586 | { |
@@ -651,7 +651,7 @@ discard block |
||
| 651 | 651 | * |
| 652 | 652 | * @see Order::doNextStatus |
| 653 | 653 | * |
| 654 | - * @param Order object |
|
| 654 | + * @param Order Order |
|
| 655 | 655 | * |
| 656 | 656 | * @return bool - true if the current step is ready to be run... |
| 657 | 657 | **/ |
@@ -670,7 +670,7 @@ discard block |
||
| 670 | 670 | * |
| 671 | 671 | * @see Order::doNextStatus |
| 672 | 672 | * |
| 673 | - * @param Order object |
|
| 673 | + * @param Order Order |
|
| 674 | 674 | * |
| 675 | 675 | * @return bool - true if run correctly. |
| 676 | 676 | **/ |
@@ -714,6 +714,7 @@ discard block |
||
| 714 | 714 | * |
| 715 | 715 | * @param string $code: the name of the step to check |
| 716 | 716 | * @param bool $orIsEqualTo if set to true, this method will return TRUE if the step being checked is the current one |
| 717 | + * @param string $code |
|
| 717 | 718 | * |
| 718 | 719 | * @return bool |
| 719 | 720 | **/ |
@@ -966,6 +967,11 @@ discard block |
||
| 966 | 967 | return $this->hasCustomerMessage() ? _t('OrderStep.YES', 'Yes') : _t('OrderStep.NO', 'No'); |
| 967 | 968 | } |
| 968 | 969 | |
| 970 | + /** |
|
| 971 | + * @param Order $order |
|
| 972 | + * |
|
| 973 | + * @return boolean|string |
|
| 974 | + */ |
|
| 969 | 975 | public function CalculatedEmailSubject($order = null) |
| 970 | 976 | { |
| 971 | 977 | return $this->EmailSubject; |
@@ -979,7 +985,7 @@ discard block |
||
| 979 | 985 | /** |
| 980 | 986 | * Formatted answer for "hasCustomerMessage". |
| 981 | 987 | * |
| 982 | - * @return string |
|
| 988 | + * @return DBField |
|
| 983 | 989 | */ |
| 984 | 990 | public function ShowAsSummary() |
| 985 | 991 | { |
@@ -989,7 +995,7 @@ discard block |
||
| 989 | 995 | /** |
| 990 | 996 | * |
| 991 | 997 | * |
| 992 | - * @return string |
|
| 998 | + * @return DBField |
|
| 993 | 999 | */ |
| 994 | 1000 | public function getShowAsSummary() |
| 995 | 1001 | { |
@@ -1049,7 +1055,7 @@ discard block |
||
| 1049 | 1055 | /** |
| 1050 | 1056 | * Formatted answer for "hasCustomerMessage". |
| 1051 | 1057 | * |
| 1052 | - * @return string |
|
| 1058 | + * @return DBField |
|
| 1053 | 1059 | */ |
| 1054 | 1060 | public function NameAndDescription() |
| 1055 | 1061 | { |