Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: src/Model/Entity/User.php
- IDEA additional info:
- Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
- <+>UTF-8
- ===================================================================
- --- src/Model/Entity/User.php (revision fca30d86f006fa7ad6b270b5edc7dd5478f65ccd)
- +++ src/Model/Entity/User.php (date 1529070486000)
- @@ -2,6 +2,7 @@
- namespace App\Model\Entity;
- use Cake\ORM\Entity;
- +use App\Service\SubscriptionService;
- /**
- * User Entity
- @@ -10,6 +11,7 @@
- * @property string $email
- * @property string $password
- * @property string $subscription
- + * @property string $subscription_expires
- */
- class User extends Entity
- {
- @@ -36,4 +38,9 @@
- protected $_hidden = [
- 'password'
- ];
- +
- + public function setSubscription($subscription = SubscriptionService::SUBSCRIPTION_TRIAL) {
- + $this->subscription = $subscription;
- + $this->subscription_expires = SubscriptionService::getSubscriptionExpires($subscription);
- + }
- }
- Index: src/Controller/UsersController.php
- IDEA additional info:
- Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
- <+>UTF-8
- ===================================================================
- --- src/Controller/UsersController.php (revision fca30d86f006fa7ad6b270b5edc7dd5478f65ccd)
- +++ src/Controller/UsersController.php (date 1529066993000)
- @@ -102,9 +102,9 @@
- 'error' => __('A user with this mail already exists. Please log in.')
- ];
- } else {
- - $user = $this->Users->newEntity();
- - $user = $this->Users->patchEntity($user, $requestData);
- + $user = $this->Users->patchEntity($this->Users->newEntity(), $requestData);
- $user->password = (new DefaultPasswordHasher)->hash($requestData["password"]);
- + $user->setSubscription();
- $user = $this->Users->save($user);
- if ($user) {
- Index: src/Template/Users/register.ctp
- IDEA additional info:
- Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
- <+>UTF-8
- ===================================================================
- --- src/Template/Users/register.ctp (revision fca30d86f006fa7ad6b270b5edc7dd5478f65ccd)
- +++ src/Template/Users/register.ctp (date 1529065434000)
- @@ -1,4 +1,4 @@
- -<h1 class="align-center">Free registration</h1>
- +<h1 class="align-center register-title">Start Your 7 Day Free Trial</h1>
- <form id="register-form" role="form" action="<?php echo $registerUrl; ?>"
- data-js-download-register="<?php echo $jsDownloadRegisterUrl; ?>"
- Index: src/Service/SubscriptionService.php
- IDEA additional info:
- Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
- <+>UTF-8
- ===================================================================
- --- src/Service/SubscriptionService.php (date 1529070561000)
- +++ src/Service/SubscriptionService.php (date 1529070561000)
- @@ -0,0 +1,28 @@
- +<?php
- +namespace App\Service;
- +
- +use Cake\I18n\Time;
- +
- +/**
- + * Class SubscriptionService
- + * @package App\Service
- + */
- +class SubscriptionService {
- + const SUBSCRIPTION_TRIAL = 'TRIAL';
- +
- + //in days
- + public static $subscriptionPeriodMap = [
- + self::SUBSCRIPTION_TRIAL => '7'
- + ];
- +
- + /**
- + * @param $subscription
- + * @return mixed
- + */
- + public static function getSubscriptionExpires($subscription) {
- + $subscriptionPeriod = self::$subscriptionPeriodMap[$subscription];
- + $expiresTime = Time::now()->addDays($subscriptionPeriod);
- +
- + return $expiresTime;
- + }
- +}
- Index: webroot/css/styles.css
- IDEA additional info:
- Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
- <+>UTF-8
- ===================================================================
- --- webroot/css/styles.css (revision fca30d86f006fa7ad6b270b5edc7dd5478f65ccd)
- +++ webroot/css/styles.css (date 1529065535000)
- @@ -705,3 +705,10 @@
- .hidden {
- display: none;
- }
- +
- +.register-title {
- + font-size: 1.8rem;
- + font-weight: bold;
- + margin: 1.5rem 0;
- + color: #464646;
- +}
- Index: sql/2018_06_15_subscription.sql
- IDEA additional info:
- Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
- <+>UTF-8
- ===================================================================
- --- sql/2018_06_15_subscription.sql (date 1529070796000)
- +++ sql/2018_06_15_subscription.sql (date 1529070796000)
- @@ -0,0 +1,5 @@
- +ALTER TABLE `users`
- +ADD `subscription` varchar(255) COLLATE 'utf8_general_ci' NOT NULL,
- +ADD `subscription_expires` datetime NOT NULL AFTER `subscription`;
- +
- +UPDATE users SET subscription = 'TRIAL', subscription_expires = (UTC_TIMESTAMP() + INTERVAL 7 DAY);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement