Advertisement
Guest User

Untitled

a guest
Jun 17th, 2018
201
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 4.60 KB | None | 0 0
  1. Index: src/Model/Entity/User.php
  2. IDEA additional info:
  3. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  4. <+>UTF-8
  5. ===================================================================
  6. --- src/Model/Entity/User.php (revision fca30d86f006fa7ad6b270b5edc7dd5478f65ccd)
  7. +++ src/Model/Entity/User.php (date 1529070486000)
  8. @@ -2,6 +2,7 @@
  9. namespace App\Model\Entity;
  10.  
  11. use Cake\ORM\Entity;
  12. +use App\Service\SubscriptionService;
  13.  
  14. /**
  15. * User Entity
  16. @@ -10,6 +11,7 @@
  17. * @property string $email
  18. * @property string $password
  19. * @property string $subscription
  20. + * @property string $subscription_expires
  21. */
  22. class User extends Entity
  23. {
  24. @@ -36,4 +38,9 @@
  25. protected $_hidden = [
  26. 'password'
  27. ];
  28. +
  29. + public function setSubscription($subscription = SubscriptionService::SUBSCRIPTION_TRIAL) {
  30. + $this->subscription = $subscription;
  31. + $this->subscription_expires = SubscriptionService::getSubscriptionExpires($subscription);
  32. + }
  33. }
  34. Index: src/Controller/UsersController.php
  35. IDEA additional info:
  36. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  37. <+>UTF-8
  38. ===================================================================
  39. --- src/Controller/UsersController.php (revision fca30d86f006fa7ad6b270b5edc7dd5478f65ccd)
  40. +++ src/Controller/UsersController.php (date 1529066993000)
  41. @@ -102,9 +102,9 @@
  42. 'error' => __('A user with this mail already exists. Please log in.')
  43. ];
  44. } else {
  45. - $user = $this->Users->newEntity();
  46. - $user = $this->Users->patchEntity($user, $requestData);
  47. + $user = $this->Users->patchEntity($this->Users->newEntity(), $requestData);
  48. $user->password = (new DefaultPasswordHasher)->hash($requestData["password"]);
  49. + $user->setSubscription();
  50. $user = $this->Users->save($user);
  51.  
  52. if ($user) {
  53. Index: src/Template/Users/register.ctp
  54. IDEA additional info:
  55. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  56. <+>UTF-8
  57. ===================================================================
  58. --- src/Template/Users/register.ctp (revision fca30d86f006fa7ad6b270b5edc7dd5478f65ccd)
  59. +++ src/Template/Users/register.ctp (date 1529065434000)
  60. @@ -1,4 +1,4 @@
  61. -<h1 class="align-center">Free registration</h1>
  62. +<h1 class="align-center register-title">Start Your 7 Day Free Trial</h1>
  63.  
  64. <form id="register-form" role="form" action="<?php echo $registerUrl; ?>"
  65. data-js-download-register="<?php echo $jsDownloadRegisterUrl; ?>"
  66. Index: src/Service/SubscriptionService.php
  67. IDEA additional info:
  68. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  69. <+>UTF-8
  70. ===================================================================
  71. --- src/Service/SubscriptionService.php (date 1529070561000)
  72. +++ src/Service/SubscriptionService.php (date 1529070561000)
  73. @@ -0,0 +1,28 @@
  74. +<?php
  75. +namespace App\Service;
  76. +
  77. +use Cake\I18n\Time;
  78. +
  79. +/**
  80. + * Class SubscriptionService
  81. + * @package App\Service
  82. + */
  83. +class SubscriptionService {
  84. + const SUBSCRIPTION_TRIAL = 'TRIAL';
  85. +
  86. + //in days
  87. + public static $subscriptionPeriodMap = [
  88. + self::SUBSCRIPTION_TRIAL => '7'
  89. + ];
  90. +
  91. + /**
  92. + * @param $subscription
  93. + * @return mixed
  94. + */
  95. + public static function getSubscriptionExpires($subscription) {
  96. + $subscriptionPeriod = self::$subscriptionPeriodMap[$subscription];
  97. + $expiresTime = Time::now()->addDays($subscriptionPeriod);
  98. +
  99. + return $expiresTime;
  100. + }
  101. +}
  102. Index: webroot/css/styles.css
  103. IDEA additional info:
  104. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  105. <+>UTF-8
  106. ===================================================================
  107. --- webroot/css/styles.css (revision fca30d86f006fa7ad6b270b5edc7dd5478f65ccd)
  108. +++ webroot/css/styles.css (date 1529065535000)
  109. @@ -705,3 +705,10 @@
  110. .hidden {
  111. display: none;
  112. }
  113. +
  114. +.register-title {
  115. + font-size: 1.8rem;
  116. + font-weight: bold;
  117. + margin: 1.5rem 0;
  118. + color: #464646;
  119. +}
  120. Index: sql/2018_06_15_subscription.sql
  121. IDEA additional info:
  122. Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
  123. <+>UTF-8
  124. ===================================================================
  125. --- sql/2018_06_15_subscription.sql (date 1529070796000)
  126. +++ sql/2018_06_15_subscription.sql (date 1529070796000)
  127. @@ -0,0 +1,5 @@
  128. +ALTER TABLE `users`
  129. +ADD `subscription` varchar(255) COLLATE 'utf8_general_ci' NOT NULL,
  130. +ADD `subscription_expires` datetime NOT NULL AFTER `subscription`;
  131. +
  132. +UPDATE users SET subscription = 'TRIAL', subscription_expires = (UTC_TIMESTAMP() + INTERVAL 7 DAY);
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement