Merge pull request #243 from ZBoxApp/salesApp

fix styles on panel component to fit all buttons on domain views (buy…

.vagrant/machines/default/virtualbox/action_set_name

-1467382402
+1467994135
\ No newline at end of file

path.json

-module.exports = {"main":{"js":"/312387bundle.js"}}
+module.exports = {"main":{"js":"/207456bundle.js"}}
\ No newline at end of file

src/components/domain/domain_mailbox_plans.jsx

@@ -210,6 +210,7 @@ export default class DomainMailboxPlans extends React.Component {
                 btnsHeader={headerButtons}
                 error={noLimitError}
                 children={panelBody}
+                classCss={['flex']}
             />
         );
     }

src/components/mailbox/edit_mailbox.jsx

@@ -127,7 +127,7 @@ export default class EditMailBox extends React.Component {
                         const price = prices[data.plan] ? currencyFormatter.format(prices[data.plan], this.currencyParams) + ' ' + this.currency : 0;
                         const options = {
                             title: 'Cambio de Plan',
-                            text: `Al presionar <strong>Aceptar</strong>, está autorizando la emisión de una factura por un total de <strong>${price}</strong> correspondiente a : <br> <ul class="text-left"><li>Asunto: Cambio de Plan</li><li>Casilla: <strong>${account.name}</strong></li><li>Plan Original: <strong>${this.currentPlan}</strong></li><li>Nuevo Plan: <strong>${data.plan}</strong></li></ul>`,
+                            text: `Al presionar <strong>Aceptar</strong>, está autorizando la emisión de una factura por un total de <strong>${price}</strong> correspondiente a : <br> <ul class="list-buy-dialog"><li>Asunto: Cambio de Plan</li><li>Casilla: <strong>${account.name}</strong></li><li>Plan Original: <strong>${Utils.titleCase(this.currentPlan)}</strong></li><li>Nuevo Plan: <strong>${Utils.titleCase(data.plan)}</strong></li></ul>`,
                             html: true,
                             confirmButtonText: 'Si, Cambiar Plan',
                             showLoaderOnConfirm: true,
@@ -164,7 +164,8 @@ export default class EditMailBox extends React.Component {
                                             });
 
                                             this.setState({
-                                                enabledAccounts
+                                                enabledAccounts,
+                                                zimbraCOSId: data.cosId
                                             });
                                         }
                                     }, {
@@ -543,7 +544,7 @@ export default class EditMailBox extends React.Component {
                             return err;
                         }
 
-                        return Utils.handleLink(e, `/mailboxes/${this.props.params.id}`, this.props.location);
+                        return Utils.handleLink(null, `/mailboxes/${this.props.params.id}`, this.props.location);
                     });
                 }
 
@@ -553,11 +554,11 @@ export default class EditMailBox extends React.Component {
                             return err;
                         }
 
-                        return Utils.handleLink(e, `/mailboxes/${this.props.params.id}`, this.props.location);
+                        return Utils.handleLink(null, `/mailboxes/${this.props.params.id}`, this.props.location);
                     });
                 }
 
-                return Utils.handleLink(e, `/mailboxes/${this.props.params.id}`, this.props.location);
+                return Utils.handleLink(null, `/mailboxes/${this.props.params.id}`, this.props.location);
             }).catch((error) => {
                 GlobalActions.emitMessage({
                     message: error.message,

src/components/panel.jsx

@@ -23,8 +23,9 @@ export default class Panel extends React.Component {
 
         let panelHeader;
         if (this.props.hasHeader && (this.props.btnsHeader || this.props.title || this.props.filter)) {
+            const {classCss} = this.props;
             panelHeader = (
-                <div className='panel-heading hbuilt clearfix'>
+                <div className={`panel-heading hbuilt clearfix ${classCss}`}>
                     <div className='pull-right text-right'>{btns}</div>
                     <div className='heading-buttons pull-left text-left'>
                         {this.props.title || this.props.filter}
@@ -52,7 +53,8 @@ Panel.propTypes = {
     classHeader: React.PropTypes.string,
     error: React.PropTypes.element,
     children: React.PropTypes.any,
-    filter: React.PropTypes.element
+    filter: React.PropTypes.element,
+    classCss: React.PropTypes.array
 };
 
 Panel.defaultProps = {

src/sass/components/_panels.scss

@@ -22,12 +22,21 @@
     padding: 10px 4px;
     transition: all .3s;
 
-    > div {
+    &:not(.flex) > div {
       max-width: 50%;
       width: 100%;
     }
 
-    .heading-buttons {
+    &.flex {
+      display: flex;
+
+      > div:first-child {
+        flex-grow: 1;
+        order: 1;
+      }
+    }
+
+    &:not(.flex) .heading-buttons {
       max-width: 50%;
     }
   }

src/sass/components/_various.scss

@@ -1650,3 +1650,19 @@ label {
     margin-bottom: 15px;
   }
 }
+
+.list-buy-dialog {
+  display: inline-block;
+  font-size: 14px;
+  list-style: none;
+  margin: 10px 0 0;
+  text-align: justify;
+
+  li {
+    &::before {
+      content: '\2705';
+      font-size: 14px;
+      margin-right: 10px;
+    }
+  }
+}

src/utils/utils.jsx

@@ -715,8 +715,9 @@ export function parseMaxCOSAccounts(maxCosAccounts) {
 }
 
 export function getDomainsCleaned(domains) {
+    var regexp = new RegExp(window.manager_config.plans.archiving.regexp, 'gi');
     const rightsDomains = domains.filter((domain) => {
-        return !domain.isAliasDomain && !domain.name.match('archive');
+        return !domain.isAliasDomain && !domain.name.match(regexp);
     });
 
     return rightsDomains;