Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into riri

src/api/index.js

@@ -66,7 +66,7 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
   const resetPassword = (body) => api.post('auth/reset_password', body)
   const verification = (body) => api.post('email/reset_password', body)
   const isResetPassword = (userId) => api.post(`auth/is_reset_password/${userId}`)
-  
+
   //Role
   const getRole = () => api.get('role/get_all_role')
   const getRoleActive = () => api.get('role/get_all_role_active')
@@ -83,7 +83,7 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
   const getUnitBisnis = () => api.get('business_unit/get_all_business_unit')
   const createUnitBisnis = (body) => api.post('/business_unit/create_business_unit', body)
   const updateUnitBisnis = (body) => api.post('/business_unit/update_business_unit', body)
-  const searchUnitBisnis = (body) => api.post('/business_unit/search_business_unit', body) 
+  const searchUnitBisnis = (body) => api.post('/business_unit/search_business_unit', body)
   const checkUploadUnitBisnis = (body) => api.post('/business_unit/check_import', body)
   const uploadUnitBisnis = (body) => api.post('/business_unit/import_business_unit', body)
 
@@ -125,12 +125,14 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
   const getAllParameter = () => api.get('/setting/get_all_setting')
   const getDetailParameter = (id) => api.get(`setting/get_setting_by_id/${id}`)
   const getAllGroup = () => api.get('/setting_group/get_all_setting_group')
-  const getParameterByGroup = (groupID) => api.get(`/setting_type/get_all_setting_type_by_group/${groupID}`) 
+  const getParameterByGroup = (groupID) => api.get(`/setting_type/get_all_setting_type_by_group/${groupID}`)
   const createParameter = (body) => api.post('setting/create_setting', body)
   const updateParameter = (body) => api.post('setting/update_setting', body)
- 
+  const checkUploadParameter = (body) => api.post('setting/check_import', body)
+  const uploadParameter = (body) => api.post('/setting/import_setting', body)
+
   //Template
-  const downloadTemplate = (fileName,fileType) => api.get(`attachment/download_file?fileName=${fileName}&&fileType=${fileType}`)
+  const downloadTemplate = (fileName, fileType) => api.get(`attachment/download_file?fileName=${fileName}&&fileType=${fileType}`)
   // ------
   // STEP 3
   // ------
@@ -196,7 +198,9 @@ const create = (baseURL = 'https://tia.eksad.com/tia-reporting-dev/public/') =>
     updateParameter,
     createParameter,
     getPerusahaanActive,
-    getRoleActive
+    getRoleActive,
+    checkUploadParameter,
+    uploadParameter
   }
 }
 

src/container/MasterData/formUnitBisnis/CreateUnitBisnis.js

@@ -261,7 +261,7 @@ export default class CreateUnitBisnis extends Component {
         return (
             <div className="test app-popup-show" style={{ paddingTop: 100 }}>
                 <div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}>
-                    <div className="popup-panel grid grid-2x" style={{ backgroundColor: '#51c6ea', height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
+                    <div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
                         <div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}>
                             <div className="popup-title">
                                 <span style={{ color: '#fff', fontSize: 16, fontWeight: 'bold' }}>Create Data</span>