@@ -253,7 +253,6 @@ discard block |
||
| 253 | 253 | * Return a link to view the order on this page. |
| 254 | 254 | * |
| 255 | 255 | * @param int|string $orderID ID of the order |
| 256 | - * @param string $type - the type of email you want to send. |
|
| 257 | 256 | * @param bool $actuallySendEmail - do we actually send the email |
| 258 | 257 | * @param int $alternativeOrderStepID - OrderStep to use |
| 259 | 258 | * |
@@ -290,7 +289,7 @@ discard block |
||
| 290 | 289 | * |
| 291 | 290 | * @param bool $isCurrentStep |
| 292 | 291 | * |
| 293 | - * @return Checkout_StepDescription |
|
| 292 | + * @return CheckoutPage_StepDescription |
|
| 294 | 293 | */ |
| 295 | 294 | public function CurrentCheckoutStep($isCurrentStep = false) |
| 296 | 295 | { |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | /** |
| 323 | 323 | * Used in getCSMFields. |
| 324 | 324 | * |
| 325 | - * @return GridField |
|
| 325 | + * @return UploadField |
|
| 326 | 326 | **/ |
| 327 | 327 | protected function getAdditionalImagesField() |
| 328 | 328 | { |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | /** |
| 338 | 338 | * Used in getCSMFields. |
| 339 | 339 | * |
| 340 | - * @return GridField |
|
| 340 | + * @return UploadField |
|
| 341 | 341 | **/ |
| 342 | 342 | protected function getAdditionalFilesField() |
| 343 | 343 | { |
@@ -626,7 +626,7 @@ discard block |
||
| 626 | 626 | /** |
| 627 | 627 | * returns the default image of the product. |
| 628 | 628 | * |
| 629 | - * @return Image | Null |
|
| 629 | + * @return string | Null |
|
| 630 | 630 | */ |
| 631 | 631 | public function DefaultImage() |
| 632 | 632 | { |
@@ -661,7 +661,7 @@ discard block |
||
| 661 | 661 | /** |
| 662 | 662 | * @TODO: complete |
| 663 | 663 | * |
| 664 | - * @param string $compontent - the has many relationship you are looking at, e.g. OrderAttribute |
|
| 664 | + * @param string $component - the has many relationship you are looking at, e.g. OrderAttribute |
|
| 665 | 665 | * |
| 666 | 666 | * @return DataList (CHECK!) |
| 667 | 667 | */ |
@@ -752,7 +752,7 @@ discard block |
||
| 752 | 752 | /** |
| 753 | 753 | * You can set an alternative class name for order item using this method. |
| 754 | 754 | * |
| 755 | - * @param string $ClassName |
|
| 755 | + * @param string $className |
|
| 756 | 756 | **/ |
| 757 | 757 | public function setAlternativeClassNameForOrderItem($className) |
| 758 | 758 | { |
@@ -879,6 +879,7 @@ discard block |
||
| 879 | 879 | * set new specific new quantity for buyable's orderitem. |
| 880 | 880 | * |
| 881 | 881 | * @param float |
| 882 | + * @param integer $quantity |
|
| 882 | 883 | * |
| 883 | 884 | * @return string (Link) |
| 884 | 885 | */ |
@@ -970,7 +971,7 @@ discard block |
||
| 970 | 971 | * In templates, it is used like this: |
| 971 | 972 | * $EcommerceConfigAjax.TableID. |
| 972 | 973 | * |
| 973 | - * @return EcommerceConfigAjax |
|
| 974 | + * @return EcommerceConfigAjaxDefinitions |
|
| 974 | 975 | **/ |
| 975 | 976 | public function AJAXDefinitions() |
| 976 | 977 | { |
@@ -1023,6 +1024,9 @@ discard block |
||
| 1023 | 1024 | |
| 1024 | 1025 | private static $_calculated_price_cache = array(); |
| 1025 | 1026 | |
| 1027 | + /** |
|
| 1028 | + * @return double |
|
| 1029 | + */ |
|
| 1026 | 1030 | public function getCalculatedPrice() |
| 1027 | 1031 | { |
| 1028 | 1032 | if (! isset(self::$_calculated_price_cache[$this->ID])) { |
@@ -372,7 +372,7 @@ discard block |
||
| 372 | 372 | * by either type (e.g. FILER) or variable (e.g dbFieldName) |
| 373 | 373 | * or both. |
| 374 | 374 | * |
| 375 | - * @param string $typeOfVariableName FILTER | SORT | DISPLAY or sessionName, getVariable, etc... |
|
| 375 | + * @param string $typeOrVariable FILTER | SORT | DISPLAY or sessionName, getVariable, etc... |
|
| 376 | 376 | * @param string $variable: sessionName, getVariable, etc... |
| 377 | 377 | * |
| 378 | 378 | * @return array | String |
@@ -1528,9 +1528,8 @@ discard block |
||
| 1528 | 1528 | |
| 1529 | 1529 | /** |
| 1530 | 1530 | * |
| 1531 | - * @param string $name |
|
| 1532 | - * @param string $filterKey |
|
| 1533 | 1531 | * |
| 1532 | + * @param string $cacheKey |
|
| 1534 | 1533 | * @return string |
| 1535 | 1534 | */ |
| 1536 | 1535 | public function cacheKey($cacheKey) |
@@ -1827,7 +1826,7 @@ discard block |
||
| 1827 | 1826 | * This is the call that is made from the template... |
| 1828 | 1827 | * The actual final products being shown. |
| 1829 | 1828 | * |
| 1830 | - * @return PaginatedList |
|
| 1829 | + * @return DataList |
|
| 1831 | 1830 | **/ |
| 1832 | 1831 | public function Products() |
| 1833 | 1832 | { |
@@ -2151,7 +2150,7 @@ discard block |
||
| 2151 | 2150 | * |
| 2152 | 2151 | * This is different from IsSearchResults. |
| 2153 | 2152 | * |
| 2154 | - * @return bool |
|
| 2153 | + * @return boolean|null |
|
| 2155 | 2154 | */ |
| 2156 | 2155 | public function ActiveSearchTerm() |
| 2157 | 2156 | { |
@@ -2217,7 +2216,7 @@ discard block |
||
| 2217 | 2216 | * Is there a special sort operating at the moment? |
| 2218 | 2217 | * Is the current sort the default one (return inverse!)? |
| 2219 | 2218 | * |
| 2220 | - * @return bool |
|
| 2219 | + * @return boolean|null |
|
| 2221 | 2220 | */ |
| 2222 | 2221 | public function HasSort() |
| 2223 | 2222 | { |
@@ -2599,7 +2598,7 @@ discard block |
||
| 2599 | 2598 | * |
| 2600 | 2599 | * @param SS_List |
| 2601 | 2600 | * |
| 2602 | - * @return PaginatedList |
|
| 2601 | + * @return ProductGroup_Controller|null |
|
| 2603 | 2602 | */ |
| 2604 | 2603 | protected function paginateList(SS_List $list) |
| 2605 | 2604 | { |
@@ -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 | { |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | private $divider = 3; |
| 29 | 29 | |
| 30 | 30 | /** |
| 31 | - *@return SQLQuery |
|
| 31 | + *@return DataQuery |
|
| 32 | 32 | **/ |
| 33 | 33 | public function apply(DataQuery $query) |
| 34 | 34 | { |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | class OrderFilters_MemberAndAddress extends ExactMatchFilter |
| 74 | 74 | { |
| 75 | 75 | /** |
| 76 | - *@return SQLQuery |
|
| 76 | + *@return DataQuery |
|
| 77 | 77 | **/ |
| 78 | 78 | public function apply(DataQuery $query) |
| 79 | 79 | { |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | class OrderFilters_MultiOptionsetStatusIDFilter extends ExactMatchFilter |
| 147 | 147 | { |
| 148 | 148 | /** |
| 149 | - *@return SQLQuery |
|
| 149 | + *@return DataQuery |
|
| 150 | 150 | **/ |
| 151 | 151 | public function apply(DataQuery $query) |
| 152 | 152 | { |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | class OrderFilters_HasBeenCancelled extends ExactMatchFilter |
| 182 | 182 | { |
| 183 | 183 | /** |
| 184 | - *@return SQLQuery |
|
| 184 | + *@return DataQuery |
|
| 185 | 185 | **/ |
| 186 | 186 | public function apply(DataQuery $query) |
| 187 | 187 | { |
@@ -216,7 +216,7 @@ discard block |
||
| 216 | 216 | class OrderFilters_MustHaveAtLeastOnePayment extends ExactMatchFilter |
| 217 | 217 | { |
| 218 | 218 | /** |
| 219 | - *@return SQLQuery |
|
| 219 | + *@return DataQuery |
|
| 220 | 220 | **/ |
| 221 | 221 | public function apply(DataQuery $query) |
| 222 | 222 | { |
@@ -90,6 +90,11 @@ |
||
| 90 | 90 | } |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | + /** |
|
| 94 | + * @param DataObject|null $lastOrderStep |
|
| 95 | + * @param string $orderStatusLogClassName |
|
| 96 | + * @param integer $offset |
|
| 97 | + */ |
|
| 93 | 98 | public function getOrdersForCreateSubmissionLogForArchivedOrders($lastOrderStep, $orderStatusLogClassName, $offset) |
| 94 | 99 | { |
| 95 | 100 | return Order::get() |
@@ -19,6 +19,9 @@ |
||
| 19 | 19 | |
| 20 | 20 | protected $deleteFirst = true; |
| 21 | 21 | |
| 22 | + /** |
|
| 23 | + * @param boolean $b |
|
| 24 | + */ |
|
| 22 | 25 | public function setDeleteFirst($b) |
| 23 | 26 | { |
| 24 | 27 | $this->deleteFirst = $b; |
@@ -196,8 +196,10 @@ |
||
| 196 | 196 | * |
| 197 | 197 | * @param string - $field - name of the field to be tested |
| 198 | 198 | * @param string - $table - name of the table to be tested |
| 199 | + * @param string $table |
|
| 200 | + * @param string $field |
|
| 199 | 201 | * |
| 200 | - * @return bool |
|
| 202 | + * @return boolean|null |
|
| 201 | 203 | */ |
| 202 | 204 | protected function makeFieldObsolete($table, $field, $format = '') |
| 203 | 205 | { |
@@ -69,6 +69,9 @@ |
||
| 69 | 69 | } |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | + /** |
|
| 73 | + * @param DataList $orderItems |
|
| 74 | + */ |
|
| 72 | 75 | public function generateExportFileData($email, $date, $orderItems) |
| 73 | 76 | { |
| 74 | 77 | $separator = ','; |