AntonLV 5 лет назад
Родитель
Сommit
013a7fc634

+ 1 - 1
inc/classes/BxDolProfile.php

@@ -103,7 +103,7 @@ class BxDolProfile extends BxDolFactory implements iBxDolProfile
         if ($mixedProfileId < 0)
             return BxDolProfileAnonymous::getInstance($mixedProfileId);
 
-        if (0 == $mixedProfileId || !($oProfile = self::getInstance($mixedProfileId, $bClearCache)))
+        if (0 === $mixedProfileId || !($oProfile = self::getInstance($mixedProfileId, $bClearCache)))
             return BxDolProfileUndefined::getInstance();
         
         return $oProfile;

+ 4 - 5
modules/base/general/classes/BxBaseModGeneralModule.php

@@ -2459,7 +2459,7 @@ class BxBaseModGeneralModule extends BxDolModule
     	return bx_get_logged_profile_id();
     }
 
-    public function getProfileInfo($iUserId = 0)
+    public function getProfileInfo($iUserId = false)
     {
         $oProfile = $this->getObjectUser($iUserId);
 
@@ -2483,12 +2483,11 @@ class BxBaseModGeneralModule extends BxDolModule
             'active' => $oProfile->isActive(),
         );
     }
-    
-    public function getObjectUser($iUserId = 0)
+
+    public function getObjectUser($iUserId = false)
     {
     	bx_import('BxDolProfile');
-        $oProfile = BxDolProfile::getInstanceMagic($iUserId);
-        return $oProfile;
+        return BxDolProfile::getInstanceMagic($iUserId);
     }
 
     public function getObjectFavorite($sSystem = '', $iId = 0)

+ 10 - 2
modules/boonex/credits/template/css/checkout.css

@@ -31,6 +31,11 @@
     justify-content: space-between;
 }
 
+.bx-credits-cb-row.bx-credits-cbr-items {
+    -webkit-flex-direction: column;
+    flex-direction: column;
+}
+
 .bx-credits-cb-item {
     position: relative;
     display: inline-block;
@@ -42,10 +47,13 @@
     justify-content: space-between;
 }
 
-.bx-credits-cbr-actions {
+.bx-credits-cb-row.bx-credits-cbr-actions {
+    -webkit-justify-content: center;
+    justify-content: center;
+
     text-align: center;
 }
-.bx-credits-cbr-actions .bx-btn {
+.bx-credits-cb-row.bx-credits-cbr-actions .bx-btn {
     display: inline-block;
     float: none;
     width: 80%;

+ 2 - 0
modules/boonex/market/install/langs/en.xml

@@ -442,6 +442,8 @@
     <string name="_bx_market_txt_price_recurring"><![CDATA[Rent for {0}{1}/{2}]]></string>
     <string name="_bx_market_txt_price_recurring_short"><![CDATA[{0}{1}/{2}]]></string>
     <string name="_bx_market_txt_price_free"><![CDATA[Free]]></string>
+    <string name="_bx_market_txt_per_hour"><![CDATA[hour]]></string>
+    <string name="_bx_market_txt_per_hour_short"><![CDATA[hour]]></string>
     <string name="_bx_market_txt_per_day"><![CDATA[day]]></string>
     <string name="_bx_market_txt_per_day_short"><![CDATA[day]]></string>
     <string name="_bx_market_txt_per_week"><![CDATA[week]]></string>

+ 2 - 0
modules/boonex/russian/data/langs/bx_market/ru.xml

@@ -437,6 +437,8 @@
     <string name="_bx_market_txt_price_recurring"><![CDATA[Арендовать за {0}{1}/{2}]]></string>
     <string name="_bx_market_txt_price_recurring_short"><![CDATA[{0}{1}/{2}]]></string>
     <string name="_bx_market_txt_price_free"><![CDATA[Бесплатно]]></string>
+    <string name="_bx_market_txt_per_hour"><![CDATA[час]]></string>
+    <string name="_bx_market_txt_per_hour_short"><![CDATA[час]]></string>
     <string name="_bx_market_txt_per_day"><![CDATA[день]]></string>
     <string name="_bx_market_txt_per_day_short"><![CDATA[день]]></string>
     <string name="_bx_market_txt_per_week"><![CDATA[неделю]]></string>