+

motopress · May 25, 2020 · e9be778 · e9be778
1 parent 436b943
commit e9be778
Show file tree

Hide file tree

Showing 23 changed files with 9,649 additions and 412 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+/node_modules/
diff --git a/README.md b/README.md
@@ -1,2 +1,10 @@
 # mp-restaurant-menu
 Restaurant Menu Plugin
+
+
+### Compile JS and blocks
+npm run dev or npm run build
+
+### Compile CSS
+gulp
+gulp less
diff --git a/admin/metaboxes/order/update-order.php b/admin/metaboxes/order/update-order.php
@@ -71,24 +71,25 @@
 		<div class="mprm-order-deliveries mprm-admin-box-inside">
 			<p>
 				<span class="label"><?php _e('Price of Delivery', 'mp-restaurant-menu'); ?>:</span>&nbsp;
-				<input name="mprm-order-delivery-cost" class="med-text" type="text" value="<?php echo esc_attr(apply_filters('mprm_order_delivery_cost', 0)); ?>"/>
+				<input name="mprm-order-delivery-cost" class="input-text" type="text" value="<?php echo esc_attr(apply_filters('mprm_order_delivery_cost', 0)); ?>"/>
 			</p>
 		</div>
 	<?php endif; ?>
 
 	<?php if (mprm_use_taxes()) : ?>
 		<div class="mprm-order-taxes mprm-admin-box-inside">
 			<p>
-				<span class="label"><?php _e('Tax', 'mp-restaurant-menu'); ?>:</span>&nbsp;
-				<input name="mprm-order-tax" class="med-text" type="text" value="<?php echo esc_attr(mprm_format_amount($order->tax)); ?>"/>
+				<span class="label"><?php _e('Taxes', 'mp-restaurant-menu'); ?>:</span>&nbsp;
+				<input name="mprm-order-tax" class="input-text" type="text" value="<?php echo esc_attr(mprm_format_amount($order->tax)); ?>"/>
 			</p>
 		</div>
 	<?php endif; ?>
 
 
 	<div class="mprm-order mprm-admin-box-inside">
 		<p>
-			<span class="label"><?php _e('Total Price', 'mp-restaurant-menu'); ?>:</span>&nbsp; <?php echo mprm_currency_symbol($order->currency); ?>&nbsp;<input name="mprm-order-total" type="text" class="small-text" value="<?php echo esc_attr(mprm_format_amount($order->total)); ?>"/>
+			<span class="label"><?php _e('Total Price', 'mp-restaurant-menu'); ?>:</span>&nbsp;
+			<input name="mprm-order-total" type="text" class="input-text" value="<?php echo esc_attr(mprm_format_amount($order->total)); ?>"/>
 		</p>
 	</div>
 

diff --git a/classes/class-hooks.php b/classes/class-hooks.php
@@ -572,6 +572,7 @@ public static function install_cart_actions() {
 		add_action('mprm_ajax_checkout_errors', 'mprm_print_errors');
 		add_action('mprm_cc_form', 'mprm_get_cc_form');
 		add_action('mprm_weekly_scheduled_events', array(Cart::get_instance(), 'delete_saved_carts'));
+		add_action('mprm_checkout_before', 'mprm_checkout_minimum_order_amount');
 	}
 
 	/**
@@ -1011,7 +1012,7 @@ public function clear_admin_filter($views) {
 		unset($views[ 'mine' ]);
 		unset($views[ 'draft' ]);
 		if (!empty($views[ 'publish' ])) {
-			$views[ 'publish' ] = preg_replace('/Published/', 'Payment Complete', $views[ 'publish' ]);
+			$views[ 'publish' ] = preg_replace('/Published/', 'New Order', $views[ 'publish' ]);
 		}
 
 		return $views;

diff --git a/classes/class-media.php b/classes/class-media.php
@@ -1403,8 +1403,11 @@ public function admin_enqueue_scripts() {
 	 * @param \WP_Screen $current_screen
 	 */
 	public function current_screen(\WP_Screen $current_screen) {
-		$this->enqueue_style('admin-styles', 'admin-styles.css');
+
 		$prefix = $this->get_prefix();
+
+		$this->enqueue_style('admin-styles', "admin-styles{$prefix}.css");
+
 		if (!empty($current_screen)) {
 			switch ($current_screen->base) {
 				case"post":
@@ -1519,8 +1522,10 @@ public function enqueue_scripts() {
 	 */
 	private function add_theme_css() {
 		global $post_type;
+		$prefix = $this->get_prefix();
+
 		$this->enqueue_style('mp-restaurant-menu-font', 'lib/mp-restaurant-menu-font.min.css');
-		$this->enqueue_style('mprm-style', 'style.css');
+		$this->enqueue_style('mprm-style', "style{$prefix}.css");
 		wp_enqueue_script('wp-util');
 
 		switch ($post_type) {

diff --git a/classes/models/shop/class-order.php b/classes/models/shop/class-order.php
@@ -584,7 +584,7 @@ public function init_metaboxes() {
 
 		add_meta_box(
 			'order-purchased',
-			__('Purchased products:', 'mp-restaurant-menu'),
+			__('Purchased products', 'mp-restaurant-menu'),
 			array($this, 'render_meta_box'),
 			$this->get_post_type('order'),
 			'advanced',

diff --git a/classes/models/shop/class-payments.php b/classes/models/shop/class-payments.php
@@ -844,7 +844,7 @@ public function get_payment_status($payment, $return_label = false) {
 				return $statuses[ $payment->status ];
 			} else {
 				// Account that our 'publish' status is labeled 'Complete'
-				$post_status = 'publish' == $payment->status ? 'Payment Complete' : $payment->post_status;
+				$post_status = 'publish' == $payment->status ? 'New Order' : $payment->post_status;
 
 				// Make sure we're matching cases, since they matter
 				$post_label = array_search(strtolower($post_status), array_map('strtolower', $statuses));
@@ -865,7 +865,7 @@ public function get_payment_status($payment, $return_label = false) {
 	public function get_payment_statuses() {
 		$payment_statuses = array(
 			'mprm-pending' => __('Pending Payment', 'mp-restaurant-menu'),
-			'publish' => __('Payment Complete', 'mp-restaurant-menu'),
+			'publish' => __('New Order', 'mp-restaurant-menu'),
 			'mprm-refunded' => __('Refunded', 'mp-restaurant-menu'),
 			'mprm-failed' => __('Failed', 'mp-restaurant-menu'),
 			'mprm-cooking' => __('Processing', 'mp-restaurant-menu'),

diff --git a/classes/modules/class-post.php b/classes/modules/class-post.php
@@ -38,12 +38,12 @@ public static function register_post_status() {
 		));
 
 		register_post_status('mprm-completed', array(
-			'label' => _x('Payment Complete', 'Order status', 'mp-restaurant-menu'),
+			'label' => _x('New Order', 'Order status', 'mp-restaurant-menu'),
 			'public' => true,
 			'exclude_from_search' => false,
 			'show_in_admin_all_list' => true,
 			'show_in_admin_status_list' => true,
-			'label_count' => _n_noop('Payment Complete <span class="count">(%s)</span>', 'Payment Complete <span class="count">(%s)</span>', 'mp-restaurant-menu')
+			'label_count' => _n_noop('New Order <span class="count">(%s)</span>', 'New Order <span class="count">(%s)</span>', 'mp-restaurant-menu')
 		));
 
 		register_post_status('mprm-refunded', array(

diff --git a/gulpfile.js b/gulpfile.js
@@ -4,20 +4,23 @@ const gulp = require('gulp'),
     autoprefixer = require('gulp-autoprefixer'),
     notifier = require('gulp-notify'),
 	cssmin = require('gulp-cssmin');
+	var rename = require('gulp-rename');
 
 
 gulp.task('less', function () {
-   return gulp.src(['./media/less/**/**/*.less', '!./media/less/no-js.less', '!./media/less/theme.less'])
+   return gulp.src(['./media/less/admin-styles.less', './media/less/style.less'])
        .pipe(plumber({
            errorHandler: notifier.onError("Error: <%= error.messageOriginal %>")
        }))
        .pipe(less())
        .pipe(autoprefixer())
+	   .pipe(gulp.dest('./media/css'))
 	   .pipe(cssmin())
+	   .pipe(rename({ extname: '.min.css' }))
        .pipe(gulp.dest('./media/css'))
 });
 
 gulp.task('default', gulp.series( function (done) {
-    gulp.watch('./media/less/**/**/*.less', gulp.series('less'));
+    gulp.watch(['./media/less/admin-styles.less', './media/less/style.less'], gulp.series('less'));
     done();
 }));
diff --git a/media/css/admin-styles.css b/media/css/admin-styles.css
@@ -6,13 +6,15 @@
   max-width: 100%;
   margin: 0 auto;
   padding: 0 20px;
-  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
 }
 .mprm-column,
 .mprm-columns {
   width: 100%;
   float: left;
-  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
 }
 /* For devices larger than 400px */
 @media (min-width: 400px) {
@@ -167,8 +169,12 @@
   .mprm-container.mprm-page-template-items.mprm-view-simple-list .mprm-all-items,
   .mprm-container.mprm-widget-categories.mprm-view-simple-list .mprm-all-items,
   .mprm-container.mprm-widget-items.mprm-view-simple-list .mprm-all-items {
-    columns: auto !important;
-    column-gap: 0;
+    -webkit-columns: auto !important;
+       -moz-columns: auto !important;
+            columns: auto !important;
+    -webkit-column-gap: 0;
+       -moz-column-gap: 0;
+            column-gap: 0;
   }
   .mprm-column,
   .mprm-columns {
@@ -304,11 +310,13 @@
 }
 .mprm-u-full-width {
   width: 100%;
-  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
 }
 .mprm-u-max-full-width {
   max-width: 100%;
-  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
 }
 .mprm-u-pull-right {
   float: right;
@@ -418,10 +426,18 @@
 }
 #mp_menu_gallery #mprm-menu-item-gallery .mp_menu_images {
   content: " ";
+  display: -webkit-box;
+  display: -ms-flexbox;
   display: flex;
-  flex-direction: row;
-  justify-content: flex-start;
-  flex-wrap: wrap;
+  -webkit-box-orient: horizontal;
+  -webkit-box-direction: normal;
+      -ms-flex-direction: row;
+          flex-direction: row;
+  -webkit-box-pack: start;
+      -ms-flex-pack: start;
+          justify-content: flex-start;
+  -ms-flex-wrap: wrap;
+      flex-wrap: wrap;
   max-width: 100%;
   padding: 9px;
   margin: 0;
@@ -447,7 +463,8 @@
 #mp_menu_gallery #mprm-menu-item-gallery .mp_menu_images .mprm-image {
   border: 1px solid #d5d5d5;
   border-radius: 2px;
-  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
   cursor: move;
   display: inline-block;
   position: relative;
@@ -472,7 +489,8 @@
 }
 #mp_menu_gallery #mprm-menu-item-gallery .mp_menu_images .mprm-image .mprm-actions li a:before {
   border-radius: 100%;
-  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+  -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
   content: "\f335";
   height: 100%;
   margin: 0;
@@ -542,21 +560,24 @@
 }
 .mprm-modal.mprm-restaurant[id^="jBoxID"] .jBox-container [data-selector=shortcode-form] .mprm-line .mprm-left-side {
   display: inline-block;
-  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
   padding: 0 5px 0 0;
   width: 40%;
   max-width: 150px;
 }
 .mprm-modal.mprm-restaurant[id^="jBoxID"] .jBox-container [data-selector=shortcode-form] .mprm-line .mprm-right-side {
   display: inline-block;
-  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
   padding: 0 0 0 5px;
   width: 59%;
   vertical-align: top;
 }
 .mprm-modal.mprm-restaurant[id^="jBoxID"] .jBox-container [data-selector=shortcode-form] .mprm-line .one-side {
   width: 100%;
-  box-sizing: border-box;
+  -webkit-box-sizing: border-box;
+          box-sizing: border-box;
 }
 .mprm-modal.mprm-restaurant[id^="jBoxID"] .jBox-container [data-selector=shortcode-form] .mprm-line .mprm-right-side input,
 .mprm-modal.mprm-restaurant[id^="jBoxID"] .jBox-container [data-selector=shortcode-form] .mprm-line .one-side input,
@@ -579,6 +600,9 @@
 .mprm-admin-box .mprm-admin-box-inside .small-text {
   width: 25%;
 }
+.mprm-admin-box .mprm-admin-box-inside .input-text {
+  width: 100%;
+}
 .admin-bar.post-type-mprm_order .mprm-row {
   padding: 12px 0;
   border-bottom: 1px solid #eee;
@@ -651,6 +675,7 @@
 }
 .wp-admin .order-status {
   display: -webkit-inline-box;
+  display: -ms-inline-flexbox;
   display: inline-flex;
   line-height: 2.25em;
   color: #777;
@@ -679,14 +704,25 @@
   color: #2e4453;
 }
 #mprm_extensions_container {
+  display: -webkit-box;
+  display: -ms-flexbox;
   display: flex;
-  flex: 1 1 auto;
+  -webkit-box-flex: 1;
+      -ms-flex: 1 1 auto;
+          flex: 1 1 auto;
   margin: 25px 0;
 }
 #mprm_extensions_container .mprm-extension {
+  display: -webkit-box;
+  display: -ms-flexbox;
   display: flex;
-  flex-direction: column;
-  align-items: flex-start;
+  -webkit-box-orient: vertical;
+  -webkit-box-direction: normal;
+      -ms-flex-direction: column;
+          flex-direction: column;
+  -webkit-box-align: start;
+      -ms-flex-align: start;
+          align-items: flex-start;
   background: #fff;
   border: 1px solid #ccc;
   padding: 14px;

diff --git a/media/css/admin-styles.min.css b/media/css/admin-styles.min.css