@@ -43,7 +43,7 @@ |
||
| 43 | 43 | * |
| 44 | 44 | * @see Order::doNextStatus |
| 45 | 45 | * |
| 46 | - * @param Order object |
|
| 46 | + * @param Order Order |
|
| 47 | 47 | * |
| 48 | 48 | * @return bool - true if the current step is ready to be run... |
| 49 | 49 | **/ |
@@ -12,7 +12,7 @@ |
||
| 12 | 12 | class OrderEmailRecordFilters_MultiOptionsetStatusIDFilter extends ExactMatchFilter |
| 13 | 13 | { |
| 14 | 14 | /** |
| 15 | - *@return SQLQuery |
|
| 15 | + *@return DataQuery |
|
| 16 | 16 | **/ |
| 17 | 17 | public function apply(DataQuery $query) |
| 18 | 18 | { |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | * @param bool (optional) $b |
| 193 | 193 | * @param int (optional) $orderID |
| 194 | 194 | * |
| 195 | - * @return bool |
|
| 195 | + * @return boolean|null |
|
| 196 | 196 | */ |
| 197 | 197 | public static function set_needs_recalculating($b = true, $orderID = 0) |
| 198 | 198 | { |
@@ -453,6 +453,7 @@ discard block |
||
| 453 | 453 | * link to edit the record. |
| 454 | 454 | * |
| 455 | 455 | * @param string | Null $action - e.g. edit |
| 456 | + * @param string $action |
|
| 456 | 457 | * |
| 457 | 458 | * @return string |
| 458 | 459 | */ |
@@ -1159,7 +1160,7 @@ discard block |
||
| 1159 | 1160 | * @param Member $member - the user cancelling the order |
| 1160 | 1161 | * @param string $reason - the reason the order is cancelled |
| 1161 | 1162 | * |
| 1162 | - * @return OrderStatusLog_Cancel |
|
| 1163 | + * @return integer |
|
| 1163 | 1164 | */ |
| 1164 | 1165 | public function Cancel(Member $member, $reason = '') |
| 1165 | 1166 | { |
@@ -1594,7 +1595,7 @@ discard block |
||
| 1594 | 1595 | * Stores the preferred currency of the order. |
| 1595 | 1596 | * IMPORTANTLY we store the exchange rate for future reference... |
| 1596 | 1597 | * |
| 1597 | - * @param EcommerceCurrency $currency |
|
| 1598 | + * @param EcommerceCurrency $newCurrency |
|
| 1598 | 1599 | */ |
| 1599 | 1600 | public function UpdateCurrency($newCurrency) |
| 1600 | 1601 | { |
@@ -1690,9 +1691,9 @@ discard block |
||
| 1690 | 1691 | * |
| 1691 | 1692 | * @param string $emailClassName - the class name of the email you wish to send |
| 1692 | 1693 | * @param string $subject - email subject |
| 1693 | - * @param bool $copyToAdmin - true by default, whether it should send a copy to the admin |
|
| 1694 | 1694 | * @param bool $resend - sends the email even it has been sent before. |
| 1695 | 1695 | * @param bool | string $adminOnlyOrToEmail - sends the email to the ADMIN ONLY, if you provide an email, it will go to the email... |
| 1696 | + * @param string $message |
|
| 1696 | 1697 | * |
| 1697 | 1698 | * @return bool TRUE for success, FALSE for failure (not tested) |
| 1698 | 1699 | */ |
@@ -1811,7 +1812,7 @@ discard block |
||
| 1811 | 1812 | * @param string $message - the additional message |
| 1812 | 1813 | * @param string $emailClassName - template to use. |
| 1813 | 1814 | * |
| 1814 | - * @return array (Message, Order, EmailLogo, ShopPhysicalAddress) |
|
| 1815 | + * @return string (Message, Order, EmailLogo, ShopPhysicalAddress) |
|
| 1815 | 1816 | */ |
| 1816 | 1817 | public function renderOrderInEmailFormat($message = '', $emailClassName) |
| 1817 | 1818 | { |
@@ -2054,7 +2055,7 @@ discard block |
||
| 2054 | 2055 | * @param string|array $excluded - Class(es) of modifier(s) to ignore in the calculation. |
| 2055 | 2056 | * @param bool $stopAtExcludedModifier - when this flag is TRUE, we stop adding the modifiers when we reach an excluded modifier. |
| 2056 | 2057 | * |
| 2057 | - * @return float |
|
| 2058 | + * @return integer |
|
| 2058 | 2059 | */ |
| 2059 | 2060 | public function ModifiersSubTotal($excluded = null, $stopAtExcludedModifier = false) |
| 2060 | 2061 | { |
@@ -2252,7 +2253,7 @@ discard block |
||
| 2252 | 2253 | * |
| 2253 | 2254 | * @param Member (optional) $member |
| 2254 | 2255 | * |
| 2255 | - * @return bool |
|
| 2256 | + * @return boolean|null |
|
| 2256 | 2257 | **/ |
| 2257 | 2258 | public function canViewAdminStuff($member = null) |
| 2258 | 2259 | { |
@@ -2305,7 +2306,7 @@ discard block |
||
| 2305 | 2306 | * If any of them need immediate attention then this is done |
| 2306 | 2307 | * first after which it will go through to the checkout page. |
| 2307 | 2308 | * |
| 2308 | - * @param Member (optional) $member |
|
| 2309 | + * @param Member Member $member |
|
| 2309 | 2310 | * |
| 2310 | 2311 | * @return bool |
| 2311 | 2312 | **/ |
@@ -2651,6 +2652,10 @@ discard block |
||
| 2651 | 2652 | { |
| 2652 | 2653 | return $this->getTitle($dateFormat, $includeName); |
| 2653 | 2654 | } |
| 2655 | + |
|
| 2656 | + /** |
|
| 2657 | + * @param string $dateFormat |
|
| 2658 | + */ |
|
| 2654 | 2659 | public function getTitle($dateFormat = null, $includeName = false) |
| 2655 | 2660 | { |
| 2656 | 2661 | if ($this->exists()) { |
@@ -2714,7 +2719,7 @@ discard block |
||
| 2714 | 2719 | /** |
| 2715 | 2720 | * Returns the subtotal of the items for this order. |
| 2716 | 2721 | * |
| 2717 | - * @return float |
|
| 2722 | + * @return integer |
|
| 2718 | 2723 | */ |
| 2719 | 2724 | public function SubTotal() |
| 2720 | 2725 | { |
@@ -2780,7 +2785,7 @@ discard block |
||
| 2780 | 2785 | /** |
| 2781 | 2786 | * Returns the total cost of an order including the additional charges or deductions of its modifiers. |
| 2782 | 2787 | * |
| 2783 | - * @return float |
|
| 2788 | + * @return integer |
|
| 2784 | 2789 | */ |
| 2785 | 2790 | public function Total() |
| 2786 | 2791 | { |
@@ -3410,7 +3415,7 @@ discard block |
||
| 3410 | 3415 | /** |
| 3411 | 3416 | * Converts the Order into HTML, based on the Order Template. |
| 3412 | 3417 | * |
| 3413 | - * @return HTML Object |
|
| 3418 | + * @return DBField Object |
|
| 3414 | 3419 | **/ |
| 3415 | 3420 | public function ConvertToHTML() |
| 3416 | 3421 | { |
@@ -3474,7 +3479,7 @@ discard block |
||
| 3474 | 3479 | * In templates, it is used like this: |
| 3475 | 3480 | * $EcommerceConfigAjax.TableID. |
| 3476 | 3481 | * |
| 3477 | - * @return EcommerceConfigAjax |
|
| 3482 | + * @return EcommerceConfigAjaxDefinitions |
|
| 3478 | 3483 | **/ |
| 3479 | 3484 | public function AJAXDefinitions() |
| 3480 | 3485 | { |
@@ -1318,28 +1318,4 @@ |
||
| 1318 | 1318 | foreach ($steps as $step) { |
| 1319 | 1319 | if (!$step->Description) { |
| 1320 | 1320 | $step->Description = $step->myDescription(); |
| 1321 | - $step->write(); |
|
| 1322 | - } |
|
| 1323 | - } |
|
| 1324 | - } |
|
| 1325 | - |
|
| 1326 | - /** |
|
| 1327 | - * returns the standard EcommerceDBConfig for use within OrderSteps. |
|
| 1328 | - * |
|
| 1329 | - * @return EcommerceDBConfig |
|
| 1330 | - */ |
|
| 1331 | - protected function EcomConfig() |
|
| 1332 | - { |
|
| 1333 | - return EcommerceDBConfig::current_ecommerce_db_config(); |
|
| 1334 | - } |
|
| 1335 | - |
|
| 1336 | - /** |
|
| 1337 | - * Explains the current order step. |
|
| 1338 | - * |
|
| 1339 | - * @return string |
|
| 1340 | - */ |
|
| 1341 | - protected function myDescription() |
|
| 1342 | - { |
|
| 1343 | - return _t('OrderStep.DESCRIPTION', 'No description has been provided for this step.'); |
|
| 1344 | - } |
|
| 1345 | -} |
|
| 1321 | + $step->write |
|
| 1346 | 1322 | \ No newline at end of file |
@@ -26,7 +26,7 @@ discard block |
||
| 26 | 26 | * |
| 27 | 27 | * @see Order::doNextStatus |
| 28 | 28 | * |
| 29 | - * @param Order object |
|
| 29 | + * @param Order Order |
|
| 30 | 30 | * |
| 31 | 31 | * @return bool - true if the current step is ready to be run... |
| 32 | 32 | **/ |
@@ -43,7 +43,7 @@ discard block |
||
| 43 | 43 | * |
| 44 | 44 | * @see Order::doNextStatus |
| 45 | 45 | * |
| 46 | - * @param Order object |
|
| 46 | + * @param Order Order |
|
| 47 | 47 | * |
| 48 | 48 | * @return bool - true if run correctly. |
| 49 | 49 | **/ |
@@ -90,6 +90,10 @@ |
||
| 90 | 90 | } |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | + /** |
|
| 94 | + * @param string $orderStatusLogClassName |
|
| 95 | + * @param integer $offset |
|
| 96 | + */ |
|
| 93 | 97 | public function getOrdersForCreateSubmissionLogForArchivedOrders($lastOrderStep, $orderStatusLogClassName, $offset) |
| 94 | 98 | { |
| 95 | 99 | return Order::get() |