From: Anthony Talarico Date: Wed, 27 Sep 2017 13:29:51 +0000 (-0400) Subject: fixing import functions for images and visible flag X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=2534dbb13979aa77b8832e7e9adf972d2564dbb0;p=WP-Plugins%2Fglm-member-db-for-sale.git fixing import functions for images and visible flag adding more styles for the admin list, fixing bugs with the import of the images and visible flags --- diff --git a/css/admin.css b/css/admin.css index ab55707..a3568e8 100644 --- a/css/admin.css +++ b/css/admin.css @@ -1,3 +1,3 @@ -#glm-admin-content-container .admin-item-label,#glm-admin-content-container .admin-item-input,#glm-admin-content-container .admin-item-list{padding:0}.admin-list-edit-item{padding:5px}.admin-list-edit-items{max-width:100px;float:right}@media (max-width: 641px){.admin-list-edit-items{margin:0 auto;float:none}}.itemTitle-record{float:left}.admin-new-item{margin-bottom:15px}.admin-new-item .admin-new-item-link{padding:5px;background:#3D84D0;color:white;text-decoration:none;border-radius:4px}.no-padding{padding:0}.no-margin{margin:0}#glm-admin-content-container .admin-item-list-header{margin-bottom:20px;padding-bottom:2px;border-bottom:1px solid lightgray}.admin-item-list-row{padding-bottom:5px}.item-company-list-header,.item-date-list-header,.item-title-list-header{font-weight:bold;font-size:16px}.admin-item-list-row:nth-child(odd){background:#e3e3e5}.item-image{display:block;max-width:200px}.item-image-row{border-bottom:1px solid lightgray;padding-bottom:10px} +.for-sale-list-wrapper .glm-row{margin:0 !important}#glm-admin-content-container .admin-item-label,#glm-admin-content-container .admin-item-input,#glm-admin-content-container .admin-item-list{padding:6px 0px 6px 2px}#glm-admin-content-container .admin-item-label .admin-item-data,#glm-admin-content-container .admin-item-input .admin-item-data,#glm-admin-content-container .admin-item-list .admin-item-data{margin-bottom:0px !important}.admin-list-edit-item{padding:5px}.admin-list-edit-items{position:absolute;right:0;max-width:100px;float:right}@media (max-width: 641px){.admin-list-edit-items{margin:0 auto;float:none}}.itemTitle-record{float:left}.admin-new-item{margin-bottom:15px}.admin-new-item .admin-new-item-link{padding:5px;background:#3D84D0;color:white;text-decoration:none;border-radius:4px}.no-padding{padding:0}.no-margin{margin:0}#glm-admin-content-container .admin-item-list-header{margin-bottom:20px;padding-bottom:2px;border-bottom:1px solid lightgray}.item-company-list-header,.item-date-list-header,.item-title-list-header{font-weight:bold;font-size:16px}.admin-item-list-row:nth-child(odd){background:#e3e3e5}.item-image{display:block;max-width:200px}.item-image-row{border-bottom:1px solid lightgray;padding-bottom:10px} /*# sourceMappingURL=admin.css.map */ diff --git a/css/admin.css.map b/css/admin.css.map index ec9f070..b315321 100644 --- a/css/admin.css.map +++ b/css/admin.css.map @@ -1 +1 @@ -{"version":3,"file":"admin.css","sources":["admin.scss"],"sourcesContent":["#glm-admin-content-container .admin-item-label,\n#glm-admin-content-container .admin-item-input,\n#glm-admin-content-container .admin-item-list{\n padding: 0;\n}\n.admin-list-edit-item{\n // float: right;\n padding: 5px;\n}\n.admin-list-edit-items{\n max-width: 100px;\n float: right;\n @media(max-width: 641px){\n margin: 0 auto;\n float: none;\n }\n}\n.itemTitle-record{\n float: left;\n}\n.admin-item-input textarea{\n \n}\n.admin-new-item{\n margin-bottom: 15px;\n}\n.admin-new-item .admin-new-item-link{\n padding: 5px;\n background: #3D84D0;\n color: white;\n text-decoration: none;\n border-radius: 4px;\n}\n.no-padding{\n padding: 0;\n}\n.no-margin{\n margin: 0;\n}\n#glm-admin-content-container .admin-item-list-header{\n margin-bottom: 20px;\n padding-bottom: 2px;\n border-bottom: 1px solid lightgray;\n}\n.admin-item-list-row{\n padding-bottom: 5px;\n/* border-bottom: 1px solid lightgray;*/\n}\n.item-company-list-header,.item-date-list-header, .item-title-list-header{\n font-weight: bold;\n font-size: 16px;\n}\n.admin-item-list-row:nth-child(odd){\n background: #e3e3e5;\n}\n.item-image{\n display: block;\n max-width: 200px;\n}\n.item-image-row{\n border-bottom: 1px solid lightgray;\n padding-bottom: 10px;\n}\n"],"names":[],"mappings":"AAAA,AAA6B,4BAAD,CAAC,iBAAiB,CAC9C,AAA6B,4BAAD,CAAC,iBAAiB,CAC9C,AAA6B,4BAAD,CAAC,gBAAgB,AAAA,CACzC,OAAO,CAAE,CAAC,CACb,AACD,AAAA,qBAAqB,AAAA,CAEjB,OAAO,CAAE,GAAG,CACf,AACD,AAAA,sBAAsB,AAAA,CAClB,SAAS,CAAE,KAAK,CAChB,KAAK,CAAE,KAAK,CAKf,AAJG,MAAM,EAAC,SAAS,EAAE,KAAK,EAH3B,AAAA,sBAAsB,AAAA,CAId,MAAM,CAAE,MAAM,CACd,KAAK,CAAE,IAAI,CAElB,CACD,AAAA,iBAAiB,AAAA,CACb,KAAK,CAAE,IAAI,CACd,AAID,AAAA,eAAe,AAAA,CACX,aAAa,CAAE,IAAI,CACtB,AACD,AAAgB,eAAD,CAAC,oBAAoB,AAAA,CAChC,OAAO,CAAE,GAAG,CACZ,UAAU,CAAE,OAAO,CACnB,KAAK,CAAE,KAAK,CACZ,eAAe,CAAE,IAAI,CACrB,aAAa,CAAE,GAAG,CACrB,AACD,AAAA,WAAW,AAAA,CACP,OAAO,CAAE,CAAC,CACb,AACD,AAAA,UAAU,AAAA,CACN,MAAM,CAAE,CAAC,CACZ,AACD,AAA6B,4BAAD,CAAC,uBAAuB,AAAA,CAChD,aAAa,CAAE,IAAI,CACnB,cAAc,CAAE,GAAG,CACnB,aAAa,CAAE,mBAAmB,CACrC,AACD,AAAA,oBAAoB,AAAA,CAChB,cAAc,CAAE,GAAG,CAEtB,AACD,AAAA,yBAAyB,CAAC,AAAA,sBAAsB,CAAE,AAAA,uBAAuB,AAAA,CACrE,WAAW,CAAE,IAAI,CACjB,SAAS,CAAE,IAAI,CAClB,AACD,AAAA,oBAAoB,AAAA,UAAW,CAAA,AAAA,GAAG,CAAC,CAC/B,UAAU,CAAE,OAAO,CACtB,AACD,AAAA,WAAW,AAAA,CACP,OAAO,CAAE,KAAK,CACd,SAAS,CAAE,KAAK,CACnB,AACD,AAAA,eAAe,AAAA,CACX,aAAa,CAAE,mBAAmB,CAClC,cAAc,CAAE,IAAI,CACvB"} \ No newline at end of file +{"version":3,"file":"admin.css","sources":["admin.scss"],"sourcesContent":[".for-sale-list-wrapper{\n .glm-row{\n margin: 0 !important;\n }\n}\n#glm-admin-content-container .admin-item-label,\n#glm-admin-content-container .admin-item-input,\n#glm-admin-content-container .admin-item-list{\n padding: 6px 0px 6px 2px;\n .admin-item-data{\n margin-bottom: 0px !important;\n }\n}\n.admin-list-edit-item{\n // float: right;\n padding: 5px;\n}\n.admin-list-edit-items{\n position: absolute;\n right: 0;\n // top: 6px;\n max-width: 100px;\n float: right;\n @media(max-width: 641px){\n margin: 0 auto;\n float: none;\n }\n}\n.itemTitle-record{\n float: left;\n}\n.admin-new-item{\n margin-bottom: 15px;\n}\n.admin-new-item .admin-new-item-link{\n padding: 5px;\n background: #3D84D0;\n color: white;\n text-decoration: none;\n border-radius: 4px;\n}\n.no-padding{\n padding: 0;\n}\n.no-margin{\n margin: 0;\n}\n#glm-admin-content-container .admin-item-list-header{\n margin-bottom: 20px;\n padding-bottom: 2px;\n border-bottom: 1px solid lightgray;\n}\n.admin-item-list-row{\n // padding-bottom: 5px;\n/* border-bottom: 1px solid lightgray;*/\n}\n.item-company-list-header,.item-date-list-header, .item-title-list-header{\n font-weight: bold;\n font-size: 16px;\n}\n.admin-item-list-row:nth-child(odd){\n background: #e3e3e5;\n}\n.item-image{\n display: block;\n max-width: 200px;\n}\n.item-image-row{\n border-bottom: 1px solid lightgray;\n padding-bottom: 10px;\n}\n"],"names":[],"mappings":"AAAA,AACI,sBADkB,CAClB,QAAQ,AAAA,CACJ,MAAM,CAAE,YAAY,CACvB,AAEL,AAA6B,4BAAD,CAAC,iBAAiB,CAC9C,AAA6B,4BAAD,CAAC,iBAAiB,CAC9C,AAA6B,4BAAD,CAAC,gBAAgB,AAAA,CACzC,OAAO,CAAE,eAAe,CAI3B,AAPD,AAII,4BAJwB,CAAC,iBAAiB,CAI1C,gBAAgB,CAHpB,AAGI,4BAHwB,CAAC,iBAAiB,CAG1C,gBAAgB,CAFpB,AAEI,4BAFwB,CAAC,gBAAgB,CAEzC,gBAAgB,AAAA,CACZ,aAAa,CAAE,cAAc,CAChC,AAEL,AAAA,qBAAqB,AAAA,CAEjB,OAAO,CAAE,GAAG,CACf,AACD,AAAA,sBAAsB,AAAA,CAClB,QAAQ,CAAE,QAAQ,CAClB,KAAK,CAAE,CAAC,CAER,SAAS,CAAE,KAAK,CAChB,KAAK,CAAE,KAAK,CAKf,AAJG,MAAM,EAAC,SAAS,EAAE,KAAK,EAN3B,AAAA,sBAAsB,AAAA,CAOd,MAAM,CAAE,MAAM,CACd,KAAK,CAAE,IAAI,CAElB,CACD,AAAA,iBAAiB,AAAA,CACb,KAAK,CAAE,IAAI,CACd,AACD,AAAA,eAAe,AAAA,CACX,aAAa,CAAE,IAAI,CACtB,AACD,AAAgB,eAAD,CAAC,oBAAoB,AAAA,CAChC,OAAO,CAAE,GAAG,CACZ,UAAU,CAAE,OAAO,CACnB,KAAK,CAAE,KAAK,CACZ,eAAe,CAAE,IAAI,CACrB,aAAa,CAAE,GAAG,CACrB,AACD,AAAA,WAAW,AAAA,CACP,OAAO,CAAE,CAAC,CACb,AACD,AAAA,UAAU,AAAA,CACN,MAAM,CAAE,CAAC,CACZ,AACD,AAA6B,4BAAD,CAAC,uBAAuB,AAAA,CAChD,aAAa,CAAE,IAAI,CACnB,cAAc,CAAE,GAAG,CACnB,aAAa,CAAE,mBAAmB,CACrC,AAKD,AAAA,yBAAyB,CAAC,AAAA,sBAAsB,CAAE,AAAA,uBAAuB,AAAA,CACrE,WAAW,CAAE,IAAI,CACjB,SAAS,CAAE,IAAI,CAClB,AACD,AAAA,oBAAoB,AAAA,UAAW,CAAA,AAAA,GAAG,CAAC,CAC/B,UAAU,CAAE,OAAO,CACtB,AACD,AAAA,WAAW,AAAA,CACP,OAAO,CAAE,KAAK,CACd,SAAS,CAAE,KAAK,CACnB,AACD,AAAA,eAAe,AAAA,CACX,aAAa,CAAE,mBAAmB,CAClC,cAAc,CAAE,IAAI,CACvB"} \ No newline at end of file diff --git a/models/admin/forSale/index.php b/models/admin/forSale/index.php index f3fec3c..1a8abab 100644 --- a/models/admin/forSale/index.php +++ b/models/admin/forSale/index.php @@ -91,21 +91,21 @@ class GlmMembersAdmin_forSale_index extends GlmDataForSale $member_list = $members->getList(); - $success_message = ""; + $success_message = ""; $haveItem = false; - $option = false; + $option = false; $item = false; $item_data = false; $itemUpdated = false; $itemUpdateError = false; $itemAdded = false; $itemAddError = false; - $view_file = 'index'; - $lockedToMember = false; - $isModerated = false; - $memberID = false; - $haveMember = false; - $where = ''; + $view_file = 'index'; + $lockedToMember = false; + $isModerated = false; + $memberID = false; + $haveMember = false; + $where = 'TRUE'; // Check if there's a logged in user who is locked to their own entity $lockedToMember = apply_filters('glm_members_locked_to_member_id', false); @@ -260,7 +260,7 @@ class GlmMembersAdmin_forSale_index extends GlmDataForSale $item_data = $this->getList(); break; default: - $item_data = $this->getList($where); + $item_data = $this->getList($where, 'title'); $view_file = 'list'; break; } diff --git a/models/admin/management/itemsImport.php b/models/admin/management/itemsImport.php index 73aaf98..3b95cbb 100644 --- a/models/admin/management/itemsImport.php +++ b/models/admin/management/itemsImport.php @@ -158,20 +158,29 @@ class GlmMembersAdmin_management_itemsImport $forsale_sql = "SELECT * FROM forsale;"; $stmt = $dbh->query($forsale_sql); $forsale = $stmt->fetchAll(PDO::FETCH_ASSOC); - // $count = 0; + $count = 0; foreach($forsale as $key=>$value){ - + + $parts = false; + $res = false; + $image_1 = false; + $image_2 = false; + $image_3 = false; + $post_exp = false; + // process the expiration values if( $value['post'] == "30days" ){ $post_exp = 30; } else if( $value['post'] == "60days" ){ $post_exp = 60; + } else if( $value['post'] == "90days" ){ + $post_exp = 90; } else if( $value['post'] == "120days" ){ $post_exp = 120; } // check for images - if($value['img']){ + if($value['img'] !== ''){ $res = $img_src . $value['img']; $parts = pathinfo($value['img']); if($parts['extension']){ @@ -179,14 +188,14 @@ class GlmMembersAdmin_management_itemsImport } } - if($value['img2']){ + if($value['img2'] !== ''){ $res = $img_src . $value['img2']; $parts = pathinfo($value['img2']); if($parts['extension']){ $image_2 = $ImageUpload->storeImage($res); } } - if($value['img3']){ + if($value['img3'] !== ''){ $res = $img_src . $value['img3']; $parts = pathinfo($value['img3']); if($parts['extension']){ @@ -210,7 +219,7 @@ class GlmMembersAdmin_management_itemsImport 'terms' =>$value['terms'], 'post_date' =>$value['ds'], 'member' =>$value['member'], - 'image_1' => $image_1['newFileName'], + 'image_1' =>$image_1['newFileName'], 'image_2' =>$image_2['newFileName'], 'image_3' =>$image_3['newFileName'], ), @@ -234,16 +243,8 @@ class GlmMembersAdmin_management_itemsImport '%s', ) ); - // $count++; } - // $forsale_topic_sql = "SELECT * FROM forsale_topic;"; - // $stmt = $dbh->query($forsale_topic_sql); - // $forsale_topic = $stmt->fetchAll(PDO::FETCH_ASSOC); - // foreach($forsale_topic as $key=>$value){ - - // } - } catch(PDOException $e) { echo '
'.print_r($e, true).'
'; } @@ -259,17 +260,8 @@ class GlmMembersAdmin_management_itemsImport $url = get_site_url() . '/wp-admin/admin.php?page=glm-members-admin-menu-management&glm_action=itemImport&option=importItems'; $limit = 200; - // $sql = "SELECT name,mother_name,misc_info, courier_date FROM chxctyitem LIMIT $limit OFFSET $start"; - // $items = $wpdb->get_results( $sql, ARRAY_A ); - $count = 0; - // foreach($items as $column=>$data ){ - // $count++; - // // $insert = array(); - - // } -// echo '
', print_r($insert), '
'; - // $wpdb->insert($table, $insert); + $resultMessage = "
Start: $start
"; $start += $limit; diff --git a/models/front/forSale/list.php b/models/front/forSale/list.php index 22c99c7..40b863c 100644 --- a/models/front/forSale/list.php +++ b/models/front/forSale/list.php @@ -110,7 +110,7 @@ class GlmMembersFront_forSale_list extends GlmDataForSale if (isset($_REQUEST['option']) && trim($_REQUEST['option']) != '') { $option = $_REQUEST['option']; } - $where .= "CURDATE() <= DATE_ADD(post_date, INTERVAL item_expiration DAY) "; + $where .= "CURDATE() <= DATE_ADD(post_date, INTERVAL item_expiration DAY) AND visible = true"; $item_data = $this->getList($where); diff --git a/scss/admin.scss b/scss/admin.scss index e615741..83c5277 100644 --- a/scss/admin.scss +++ b/scss/admin.scss @@ -1,13 +1,24 @@ +.for-sale-list-wrapper{ + .glm-row{ + margin: 0 !important; + } +} #glm-admin-content-container .admin-item-label, #glm-admin-content-container .admin-item-input, #glm-admin-content-container .admin-item-list{ - padding: 0; + padding: 6px 0px 6px 2px; + .admin-item-data{ + margin-bottom: 0px !important; + } } .admin-list-edit-item{ // float: right; padding: 5px; } .admin-list-edit-items{ + position: absolute; + right: 0; + // top: 6px; max-width: 100px; float: right; @media(max-width: 641px){ @@ -17,9 +28,6 @@ } .itemTitle-record{ float: left; -} -.admin-item-input textarea{ - } .admin-new-item{ margin-bottom: 15px; @@ -43,7 +51,7 @@ border-bottom: 1px solid lightgray; } .admin-item-list-row{ - padding-bottom: 5px; + // padding-bottom: 5px; /* border-bottom: 1px solid lightgray;*/ } .item-company-list-header,.item-date-list-header, .item-title-list-header{ diff --git a/views/admin/forSale/list.html b/views/admin/forSale/list.html index 0333c3b..ff20ceb 100644 --- a/views/admin/forSale/list.html +++ b/views/admin/forSale/list.html @@ -7,32 +7,34 @@ {/if} {if $itemData} -
- New item -
-
-
Topic
-
Forsale Item
-
Item Post Date
-
Post For
-
- - {foreach $itemData as $item=>$data} -
-
-
-
{$data.topic.name}
-
{$data.title}
-
{$data.post_date.timestamp|date_format:"%Y-%m-%d"}
-
{$data.item_expiration.name}
+
+
+ New item +
+
+
Topic
+
Forsale Item
+
Item Post Date
+
Post For
+
+ + {foreach $itemData as $item=>$data} +
+
+
+
{$data.topic.name}
+
{$data.title}
+
{$data.post_date.timestamp|date_format:"%Y-%m-%d"}
+
{$data.item_expiration.name}
+
+
+
+ Edit + Delete
-
- Edit - Delete -
-
- {/foreach} + {/foreach} +