diff --git a/Controller/BackendController.php b/Controller/BackendController.php index ac0c224..7901aad 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -34,7 +34,6 @@ use phpOMS\Views\View; * While costs are universal the goal for promotions, events etc. is not. * In some cases it could be sales in others it could be response rate etc. * Implement a way to define goals and allow manual+system side evaluation. - * */ final class BackendController extends Controller { diff --git a/Models/PermissionState.php b/Models/PermissionState.php index eacbe61..ee4367b 100755 --- a/Models/PermissionState.php +++ b/Models/PermissionState.php @@ -27,5 +27,6 @@ use phpOMS\Stdlib\Base\Enum; abstract class PermissionState extends Enum { public const PROMOTION = 1; + public const EVENT = 2; } diff --git a/Models/ProgressType.php b/Models/ProgressType.php index 947fa84..93aee68 100755 --- a/Models/ProgressType.php +++ b/Models/ProgressType.php @@ -27,8 +27,12 @@ use phpOMS\Stdlib\Base\Enum; abstract class ProgressType extends Enum { public const MANUAL = 0; + public const LINEAR = 1; + public const EXPONENTIAL = 2; + public const LOG = 3; + public const TASKS = 4; } diff --git a/Models/Promotion.php b/Models/Promotion.php index 862022f..f6cf70d 100755 --- a/Models/Promotion.php +++ b/Models/Promotion.php @@ -49,6 +49,7 @@ class Promotion * @since 1.0.0 */ private string $name = ''; + /** * Description. * diff --git a/Theme/Backend/event-create.tpl.php b/Theme/Backend/event-create.tpl.php index 961d546..8c0b02f 100755 --- a/Theme/Backend/event-create.tpl.php +++ b/Theme/Backend/event-create.tpl.php @@ -28,13 +28,13 @@ echo $this->getData('nav')->render(); ?> - + - + - + diff --git a/Theme/Backend/event-list.tpl.php b/Theme/Backend/event-list.tpl.php index 1c4b20a..73c92b9 100755 --- a/Theme/Backend/event-list.tpl.php +++ b/Theme/Backend/event-list.tpl.php @@ -27,15 +27,15 @@ echo $this->getData('nav')->render(); ?> - $value) : ++$count; ?> diff --git a/Theme/Backend/promotion-create.tpl.php b/Theme/Backend/promotion-create.tpl.php index 7441082..442b80c 100755 --- a/Theme/Backend/promotion-create.tpl.php +++ b/Theme/Backend/promotion-create.tpl.php @@ -28,15 +28,15 @@ echo $this->getData('nav')->render(); ?>
getHtml('Status') ?> - getHtml('Type') ?> - getHtml('Title') ?> - getHtml('Start') ?> - getHtml('End') ?> - getHtml('Location') ?> - getHtml('Expenses') ?> - getHtml('Sales') ?> - getHtml('Budget') ?> + getHtml('Status'); ?> + getHtml('Type'); ?> + getHtml('Title'); ?> + getHtml('Start'); ?> + getHtml('End'); ?> + getHtml('Location'); ?> + getHtml('Expenses'); ?> + getHtml('Sales'); ?> + getHtml('Budget'); ?>
-
+
-
+
-
+
-
+
-
+
diff --git a/Theme/Backend/promotion-list.tpl.php b/Theme/Backend/promotion-list.tpl.php index ff50c6a..62bae8f 100755 --- a/Theme/Backend/promotion-list.tpl.php +++ b/Theme/Backend/promotion-list.tpl.php @@ -29,16 +29,16 @@ echo $this->getData('nav')->render(); ?> - $value) : ++$count; - $url = \phpOMS\Uri\UriFactory::build('{/prefix}marketing/promotion/profile?{?}&id=' . $value->getId());?> + $url = \phpOMS\Uri\UriFactory::build('{/prefix}marketing/promotion/profile?{?}&id=' . $value->getId()); ?> -
getHtml('Title') ?> - getHtml('Start') ?> - getHtml('Due') ?> + getHtml('Title'); ?> + getHtml('Start'); ?> + getHtml('Due'); ?>
printHtml($value->getName()); ?> - printHtml($value->getStart()->format('Y-m-d')); ?> - printHtml($value->getEnd()->format('Y-m-d')); ?> + printHtml($value->getName()); ?> + printHtml($value->getStart()->format('Y-m-d')); ?> + printHtml($value->getEnd()->format('Y-m-d')); ?>
getHtml('Empty', '0', '0'); ?> diff --git a/Theme/Backend/promotion-profile.tpl.php b/Theme/Backend/promotion-profile.tpl.php index 1d36d6b..0c42846 100755 --- a/Theme/Backend/promotion-profile.tpl.php +++ b/Theme/Backend/promotion-profile.tpl.php @@ -25,15 +25,15 @@ echo $this->getData('nav')->render(); ?>
-
+
-
- +
+
-
+
-
+
diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index 2b5c8fc..0ab9341 100755 --- a/tests/Admin/AdminTest.php +++ b/tests/Admin/AdminTest.php @@ -20,6 +20,7 @@ namespace Modules\Marketing\tests\Admin; class AdminTest extends \PHPUnit\Framework\TestCase { protected const MODULE_NAME = 'Marketing'; + protected const URI_LOAD = ''; use \Modules\tests\ModuleTestTrait;