Restyle

Author: webdevstar

src/admin/client/modules/customer-groups/actions.js

@@ -69,7 +69,7 @@ function successDeleteGroup(id) {
 function fetchGroups() {
   return dispatch => {
     dispatch(requestGroups());
-    return api.customer_groups.list()
+    return api.customerGroups.list()
       .then(({status, json}) => {
         json = json.sort((a,b) => (a.position - b.position ));
 
@@ -107,7 +107,7 @@ export function fetchGroupsIfNeeded() {
 export function updateGroup(data) {
   return (dispatch, getState) => {
     dispatch(requestUpdateGroup(data.id));
-    return api.customer_groups.update(data.id, data)
+    return api.customerGroups.update(data.id, data)
       .then(({status, json}) => {
           dispatch(receiveUpdateGroup());
           dispatch(fetchGroups());
@@ -120,7 +120,7 @@ export function updateGroup(data) {
 
 export function createGroup(data) {
   return (dispatch, getState) => {
-    return api.customer_groups.create(data)
+    return api.customerGroups.create(data)
       .then(({status, json}) => {
           dispatch(successCreateGroup(json.id));
           dispatch(fetchGroups());
@@ -135,7 +135,7 @@ export function createGroup(data) {
 
 export function deleteGroup(id) {
   return (dispatch, getState) => {
-    return api.customer_groups.delete(id)
+    return api.customerGroups.delete(id)
       .then(({status, json}) => {
         if(status === 200) {
           dispatch(successDeleteGroup(id));

src/admin/client/modules/product-categories/actions.js

@@ -82,7 +82,7 @@ function successReplaceCategory(newParentId) {
 export function fetchCategories() {
   return dispatch => {
     dispatch(requestCategories());
-    return api.product_categories.list()
+    return api.productCategories.list()
       .then(({status, json}) => {
         json.forEach((element, index, theArray) => {
           if(theArray[index].name === '') {
@@ -118,7 +118,7 @@ export function fetchCategoriesIfNeeded() {
 function sendUpdateCategory(id, data) {
   return dispatch => {
     dispatch(requestUpdateCategory(id));
-    return api.product_categories.update(id, data)
+    return api.productCategories.update(id, data)
       .then(({status, json}) => {
           dispatch(receiveUpdateCategory());
           dispatch(fetchCategories());
@@ -137,7 +137,7 @@ export function updateCategory(data) {
 
 export function createCategory() {
   return (dispatch, getState) => {
-    return api.product_categories.create({ enabled: false })
+    return api.productCategories.create({ enabled: false })
       .then(({status, json}) => {
           dispatch(successCreateCategory(json.id));
           dispatch(fetchCategories());
@@ -155,7 +155,7 @@ export function deleteImage() {
     const state = getState();
     const categoryId = state.productCategories.selectedId;
 
-    return api.product_categories.deleteImage(categoryId)
+    return api.productCategories.deleteImage(categoryId)
       .then(({status, json}) => {
         if(status === 200) {
           dispatch(fetchCategories());
@@ -172,7 +172,7 @@ export function deleteImage() {
 
 export function deleteCategory(id) {
   return (dispatch, getState) => {
-    return api.product_categories.delete(id)
+    return api.productCategories.delete(id)
       .then(({status, json}) => {
         if(status === 200) {
           dispatch(successDeleteCategory(id));
@@ -201,9 +201,9 @@ function moveCategory(allCategories = [], selectedCategory, isUp = true) {
       let targetCategory = allCategories[0];
       let newPosition = targetCategory.position;
 
-      api.product_categories.update(selectedCategory.id, { position: targetCategory.position })
+      api.productCategories.update(selectedCategory.id, { position: targetCategory.position })
       .then(() => {
-        api.product_categories.update(targetCategory.id, { position: selectedCategory.position })
+        api.productCategories.update(targetCategory.id, { position: selectedCategory.position })
         .then(() => {
           resolve(newPosition);
         })
@@ -254,7 +254,7 @@ export function replaceCategory(parentId) {
     let state = getState();
     var selectedCategory = state.productCategories.items.find((item) => (item.id === state.productCategories.selectedId));
 
-    return api.product_categories.update(selectedCategory.id, { parent_id: parentId })
+    return api.productCategories.update(selectedCategory.id, { parent_id: parentId })
       .then(({status, json}) => {
           dispatch(successReplaceCategory());
           dispatch(fetchCategories());

src/admin/client/modules/products/actions.js

@@ -313,7 +313,7 @@ export function fetchProduct(id) {
 
 export function fetchImages(productId) {
   return (dispatch, getState) => {
-    return api.products.getImages(productId).then(({status, json}) => {
+    return api.products.images.list(productId).then(({status, json}) => {
       dispatch(receiveImages(json))
     })
     .catch(error => {});
@@ -323,7 +323,7 @@ export function fetchImages(productId) {
 
 export function deleteImage(productId, imageId) {
   return (dispatch, getState) => {
-    return api.products.deleteImage(productId, imageId).then(({status, json}) => {
+    return api.products.images.delete(productId, imageId).then(({status, json}) => {
       dispatch(fetchImages(productId))
     })
     .catch(error => {});

src/admin/client/modules/products/edit/images/components/images.js

@@ -1,5 +1,6 @@
 import React from 'react'
 import Gallery from 'modules/shared/image-upload-multiple'
+import Paper from 'material-ui/Paper';
 
 export default class ProductImages extends React.Component {
   constructor(props) {
@@ -13,7 +14,11 @@ export default class ProductImages extends React.Component {
   render() {
     let {productId, images, onImageDelete, onImageSort, fetchData} = this.props;
     return (
-      <Gallery productId={productId} images={images} onImageDelete={onImageDelete} onImageSort={onImageSort} onUpload={fetchData} />
+      <Paper className="paper-box" zDepth={1}>
+        <div style={{ padding: '10px 10px 30px 10px' }}>
+          <Gallery productId={productId} images={images} onImageDelete={onImageDelete} onImageSort={onImageSort} onUpload={fetchData} />
+        </div>
+      </Paper>
     )
   }
 }

src/admin/client/modules/settings/actions.js

@@ -211,7 +211,7 @@ export function updateEmailTemplate(emailTemplate) {
 
 export function fetchCheckoutFields() {
   return (dispatch, getState) => {
-    return api.checkout_fields.list().then(({status, json}) => {
+    return api.checkoutFields.list().then(({status, json}) => {
       dispatch(receiveCheckoutFields(json))
     }).catch(error => {});
   }
@@ -220,7 +220,7 @@ export function fetchCheckoutFields() {
 export function fetchCheckoutField(fieldName) {
   return (dispatch, getState) => {
     dispatch(requestCheckoutField())
-    return api.checkout_fields.retrieve(fieldName).then(({status, json}) => {
+    return api.checkoutFields.retrieve(fieldName).then(({status, json}) => {
       json.fieldName = fieldName;
       dispatch(receiveCheckoutField(json))
     }).catch(error => {});
@@ -229,7 +229,7 @@ export function fetchCheckoutField(fieldName) {
 
 export function updateCheckoutField(checkoutField) {
   return (dispatch, getState) => {
-    return api.checkout_fields.update(checkoutField.fieldName, checkoutField).then(({status, json}) => {
+    return api.checkoutFields.update(checkoutField.fieldName, checkoutField).then(({status, json}) => {
       json.fieldName = fieldName;
       dispatch(receiveCheckoutField(json))
     }).catch(error => {});
@@ -238,79 +238,79 @@ export function updateCheckoutField(checkoutField) {
 
 export function fetchShippingMethods() {
   return (dispatch, getState) => {
-    return api.shipping_methods.list().then(({status, json}) => {
+    return api.shippingMethods.list().then(({status, json}) => {
       dispatch(receiveShippingMethods(json))
     }).catch(error => {});
   }
 }
 
 export function fetchPaymentMethods() {
   return (dispatch, getState) => {
-    return api.payment_methods.list().then(({status, json}) => {
+    return api.paymentMethods.list().then(({status, json}) => {
       dispatch(receivePaymentMethods(json))
     }).catch(error => {});
   }
 }
 
 export function updateShippingMethod(method) {
   return (dispatch, getState) => {
-    return api.shipping_methods.update(method.id, method).then(({status, json}) => {
+    return api.shippingMethods.update(method.id, method).then(({status, json}) => {
       dispatch(fetchShippingMethods())
     }).catch(error => {});
   }
 }
 
 export function updatePaymentMethod(method) {
   return (dispatch, getState) => {
-    return api.payment_methods.update(method.id, method).then(({status, json}) => {
+    return api.paymentMethods.update(method.id, method).then(({status, json}) => {
       dispatch(fetchPaymentMethods())
     }).catch(error => {});
   }
 }
 
 export function fetchShippingMethod(id) {
   return (dispatch, getState) => {
-    return api.shipping_methods.retrieve(id).then(({status, json}) => {
+    return api.shippingMethods.retrieve(id).then(({status, json}) => {
       dispatch(receiveShippingMethod(json))
     }).catch(error => {});
   }
 }
 
 export function fetchPaymentMethod(id) {
   return (dispatch, getState) => {
-    return api.payment_methods.retrieve(id).then(({status, json}) => {
+    return api.paymentMethods.retrieve(id).then(({status, json}) => {
       dispatch(receivePaymentMethod(json))
     }).catch(error => {});
   }
 }
 
 export function deleteShippingMethod(methodId) {
   return (dispatch, getState) => {
-    return api.shipping_methods.delete(methodId).then(({status, json}) => {
+    return api.shippingMethods.delete(methodId).then(({status, json}) => {
       dispatch(fetchShippingMethods())
     }).catch(error => {});
   }
 }
 
 export function deletePaymentMethod(methodId) {
   return (dispatch, getState) => {
-    return api.payment_methods.delete(methodId).then(({status, json}) => {
+    return api.paymentMethods.delete(methodId).then(({status, json}) => {
       dispatch(fetchPaymentMethods())
     }).catch(error => {});
   }
 }
 
 export function createShippingMethod(method) {
   return (dispatch, getState) => {
-    return api.shipping_methods.create(method).then(({status, json}) => {
+    return api.shippingMethods.create(method).then(({status, json}) => {
       dispatch(fetchShippingMethods())
     }).catch(error => {});
   }
 }
 
 export function createPaymentMethod(method) {
   return (dispatch, getState) => {
-    return api.payment_methods.create(method).then(({status, json}) => {
+    return api.paymentMethods.create(method).then(({status, json}) => {
       dispatch(fetchPaymentMethods())
     }).catch(error => {});
   }

src/admin/client/modules/shared/image-upload-multiple/uploader.js

@@ -91,7 +91,7 @@ export default class MultiUploader extends React.Component {
 
 
         {percentComplete === 100 &&
-          <RaisedButton label={messages.actions_upload} style={{ marginLeft:20, marginTop:10 }} onTouchTap={() => { this.dropzone.open() }} />
+          <RaisedButton primary={true} label={messages.chooseImage} style={{ marginLeft:20, marginTop:10 }} onTouchTap={() => { this.dropzone.open() }} />
         }
 
         {percentComplete < 100 &&