System registration has been rebuilt

rskrzypczak · Feb 11, 2019 · af140eb · af140eb
1 parent 4484b35
commit af140eb
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 20 deletions.
diff --git a/CODE_OF_CONDUCT.md → .github/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md → .github/CODE_OF_CONDUCT.md
diff --git a/app/YetiForce/Register.php b/app/YetiForce/Register.php
@@ -34,12 +34,7 @@ class Register
 	 * @var string
 	 */
 	private static $registrationUrl = 'https://api.yetiforce.com/registration/';
-	/**
-	 * Companies details.
-	 *
-	 * @var null|string[]
-	 */
-	public $companies;
+
 	/**
 	 * Registration file path.
 	 *
@@ -80,7 +75,7 @@ public static function getCrmKey(): string
 	 */
 	private static function getInstanceKey(): string
 	{
-		return sha1(\App\Config::main('site_URL') . ($_SERVER['SERVER_ADDR'] ?? $_SERVER['COMPUTERNAME'] ?? null));
+		return sha1(\App\Config::main('application_unique_key') . \App\Config::main('site_URL') . ($_SERVER['SERVER_ADDR'] ?? $_SERVER['COMPUTERNAME'] ?? null));
 	}
 
 	/**
@@ -90,7 +85,7 @@ private static function getInstanceKey(): string
 	 */
 	private function getData(): array
 	{
-		$companies = $this->companies ?? \App\Company::getAll();
+		$companies = \App\Company::getAll();
 		foreach ($companies as &$row) {
 			if (\file_exists(\Settings_Companies_Record_Model::$logoPath . $row['id'])) {
 				$row['logo'] = \App\Fields\File::getImageBaseData(\Settings_Companies_Record_Model::$logoPath . $row['id']);
@@ -187,6 +182,7 @@ public static function check()
 					$status = true;
 				}
 			}
+
 			static::updateMetaData($data);
 		} catch (\Throwable $e) {
 			\App\Log::warning($e->getMessage(), __METHOD__);

diff --git a/languages/en-US/Settings/Companies.json b/languages/en-US/Settings/Companies.json
@@ -17,6 +17,7 @@
     "LBL_INDUSTRY": "Industry",
     "LBL_FIRSTNAME": "First name",
     "LBL_LASTNAME": "Last name",
+    "LBL_LOGO": "Logo",
     "LBL_EMAIL_NEWSLETTER_INFO": "Optional fields, entering data, you agree to receive Newsletter",
     "LBL_COMPANY_NAMES_EXIST": "The company name already exists",
     "LBL_REGISTER_CRM_ONLINE": "Registration - OnLine",

diff --git a/modules/Settings/Roles/views/DeleteAjax.php b/modules/Settings/Roles/views/DeleteAjax.php
@@ -21,7 +21,7 @@ public function process(\App\Request $request)
 		$allRoles = Settings_Roles_Record_Model::getAll();
 		unset($allRoles[$recordId]);
 		$allRoles = array_filter($allRoles, function ($items) use ($baseParentRole) {
-			return strpos($items->get('parentrole') , $baseParentRole) === false;
+			return strpos($items->get('parentrole'), $baseParentRole) === false;
 		});
 		$viewer->assign('MODULE', $moduleName);
 		$viewer->assign('QUALIFIED_MODULE', $qualifiedModuleName);

diff --git a/public_html/layouts/basic/styles/Main.css b/public_html/layouts/basic/styles/Main.css
@@ -17439,7 +17439,8 @@ input[type="radio"]:checked:before {
 .widget_header .breadcrumb {
   background: none;
   flex-wrap: nowrap;
-  align-items: center; }
+  align-items: center;
+  overflow-y: auto; }
 .widget_header .breadcrumb-item {
   white-space: nowrap;
   height: fit-content; }
@@ -17581,6 +17582,12 @@ input[type="radio"]:checked:before {
   height: calc(100% - 50px);
   width: 100%;
   position: relative; }
+  .c-menu__body .ps__rail-y, .c-menu__body .ps__rail-x {
+    background-color: transparent !important; }
+  .c-menu__body .ps__rail-y:hover > .ps__thumb-y {
+    width: 0.5rem; }
+  .c-menu__body .ps__rail-x:hover > .ps__thumb-x {
+    width: 0.5rem; }
 .c-menu__item__icon {
   padding-right: 1.125rem;
   font-size: 1.6em;
@@ -18649,8 +18656,9 @@ input[type="radio"]:checked:before {
   .o-detail__icon.fa {
     display: inline; }
 
-.detailViewTable .fieldLabel {
-  height: inherit; }
+@media (min-width: 992px) {
+  .detailViewTable .fieldLabel {
+    height: inherit; } }
 .detailViewTable .fieldLabel.medium, .detailViewTable .fieldValue.medium {
   padding: 10px;
   min-height: 40px; }
@@ -18951,15 +18959,18 @@ input[type="radio"]:checked:before {
   position: relative; }
 .c-progress__icon {
   color: var(--white);
-  font-size: 0.9375rem; }
-  .c-progress__icon.fa-circle {
-    margin-right: 0.0625rem; }
+  font-size: 1rem; }
+  .c-progress__icon__dot {
+    width: calc(100% - 0.375rem);
+    height: calc(100% - 0.375rem);
+    background: white;
+    border-radius: 50%; }
   .c-progress__icon.fa-check, .c-progress__icon.fa-lock {
-    font-size: 0.6875rem; }
+    font-size: 0.75rem; }
   .c-progress__icon__container {
     z-index: 1;
-    height: 1.3125rem;
-    width: 1.3125rem;
+    height: 1.375rem;
+    width: 1.375rem;
     display: flex;
     background: #ff5722;
     border-radius: 50%;
@@ -18979,7 +18990,7 @@ input[type="radio"]:checked:before {
   .c-progress__item:after, .c-progress__item:before {
     content: '';
     position: absolute;
-    top: 0.5625rem;
+    top: 0.625rem;
     width: 50%;
     background: #ff5722;
     left: 0;

diff --git a/public_html/layouts/basic/styles/Main.css.map b/public_html/layouts/basic/styles/Main.css.map