Added conditions to rules.

vendidero · Nov 10, 2023 · c7bfaa0 · c7bfaa0
1 parent 3946f2b
commit c7bfaa0
Show file tree

Hide file tree

Showing 9 changed files with 702 additions and 236 deletions.
diff --git a/assets/css/admin.css b/assets/css/admin.css
@@ -253,7 +253,7 @@ table.wc-gzd-shipments-shipping-rules th, table.wc-gzd-shipments-shipping-rules
   background: #fff;
   display: table-cell !important; }
   table.wc-gzd-shipments-shipping-rules th.conditions, table.wc-gzd-shipments-shipping-rules td.conditions {
-    width: 35%; }
+    width: 45%; }
   table.wc-gzd-shipments-shipping-rules th.actions, table.wc-gzd-shipments-shipping-rules td.actions {
     text-align: right; }
 
@@ -292,9 +292,24 @@ table.wc-gzd-shipments-shipping-rules tbody td.sort {
     height: 100%;
     line-height: 24px; }
 
+table.wc-gzd-shipments-shipping-rules tbody td p.form-field {
+  margin: 0;
+  position: relative;
+  top: -6px; }
+
+table.wc-gzd-shipments-shipping-rules tbody td.conditions .inner-conditions {
+  width: 100%;
+  border-spacing: 0; }
+  table.wc-gzd-shipments-shipping-rules tbody td.conditions .inner-conditions tbody tr td {
+    padding: 0 !important;
+    padding-bottom: .25em !important; }
+  table.wc-gzd-shipments-shipping-rules tbody td.conditions .inner-conditions tbody tr:last-child td {
+    padding-bottom: 0 !important; }
+
 table.wc-gzd-shipments-shipping-rules tbody td.conditions .conditions-columns {
   display: flex;
-  flex-wrap: wrap; }
+  flex-wrap: wrap;
+  align-items: baseline; }
   table.wc-gzd-shipments-shipping-rules tbody td.conditions .conditions-columns .shipping-rules-type-container input {
     max-width: 80px; }
   table.wc-gzd-shipments-shipping-rules tbody td.conditions .conditions-columns .conditions-column {
@@ -303,6 +318,10 @@ table.wc-gzd-shipments-shipping-rules tbody td.conditions .conditions-columns {
       width: 30%; }
       table.wc-gzd-shipments-shipping-rules tbody td.conditions .conditions-columns .conditions-column.conditions-when select {
         width: 100%; }
+    table.wc-gzd-shipments-shipping-rules tbody td.conditions .conditions-columns .conditions-column.conditions-actions {
+      margin-left: auto; }
+      table.wc-gzd-shipments-shipping-rules tbody td.conditions .conditions-columns .conditions-column.conditions-actions .button {
+        margin-top: 0; }
 
 table.wc-gzd-shipments-shipping-rules tbody td.costs p.form-field input {
   max-width: 110px; }

diff --git a/assets/css/admin.min.css b/assets/css/admin.min.css
diff --git a/assets/css/admin.scss b/assets/css/admin.scss
@@ -386,7 +386,7 @@ table.wc-gzd-shipments-shipping-rules {
     display: table-cell !important;
 
     &.conditions {
-      width: 35%;
+      width: 45%;
     }
 
     &.actions {
@@ -446,10 +446,37 @@ table.wc-gzd-shipments-shipping-rules {
         }
       }
 
+      p.form-field {
+        margin: 0;
+        position: relative;
+        top: -6px;
+      }
+
       &.conditions {
+        .inner-conditions {
+          width: 100%;
+          border-spacing: 0;
+
+          tbody {
+            tr {
+              td {
+                padding: 0 !important;
+                padding-bottom: .25em !important;
+              }
+
+              &:last-child {
+                td {
+                  padding-bottom: 0 !important;
+                }
+              }
+            }
+          }
+        }
+
         .conditions-columns {
           display: flex;
           flex-wrap: wrap;
+          align-items: baseline;
 
           .shipping-rules-type-container {
             input {
@@ -467,6 +494,14 @@ table.wc-gzd-shipments-shipping-rules {
                 width: 100%;
               }
             }
+
+            &.conditions-actions {
+              margin-left: auto;
+
+              .button {
+                margin-top: 0;
+              }
+            }
           }
         }
       }