Changeset 118

Timestamp:

11/10/06 10:40:50 (2 years ago)

Author:

moensch

Message:

You can now search by barcode for the Till and can define the default focus field in the configuration (User ID or Barcode)

Files:

• trunk/com_mls_catering/admin.mls_catering.html.php (modified) (3 diffs)
• trunk/com_mls_catering/admin.mls_catering.php (modified) (4 diffs)
• trunk/com_mls_catering/lang/english.php (modified) (2 diffs)

trunk/com_mls_catering/admin.mls_catering.html.php

@@ -103 +103 @@
-                        </tr>
-                        <tr> 
+                                <td width="20%" valign="top" align="right"><?php echo $l->m("barcode") ?>:</td>
+                                <td width="80%"><input class="text_area" id="barcode" type="text" name="barcode" size="12" maxlength="12" value="" /></td>
+                        </tr>
+                        <tr> 
-                                <td align="right" valign="top"><?php echo $l->m("search_user") ?>:</td>
-                                <td><input class="text_area" id="search_user" type="text" name="search_user" size="30" maxlength="255" value="" /></td>
@@ -120 +124 @@
-                </form>
-                <script language="JavaScript">
-userid
+<?php echo $cnf_mls_catering["search_default"]; ?>
-                </script>
-                <?php
@@ -1240 +1244 @@
-                                <td width="80%"><?php echo $lists["show_form"]; ?></td>
-                        </tr>
+                        <tr>
+                                <td width="20%" valign="top" align="right"><?php echo $l->m("search_default"); ?>:</td>
+                                <td width="80%"><?php echo $lists["search_default"]; ?></td>
+                        </tr>
-                </table>
-                <input type="hidden" name="option" value="<?php echo $option; ?>" />

trunk/com_mls_catering/admin.mls_catering.php

@@ -254 +254 @@
-        // First, get through the user stuff
-        $userid = mosGetParam($_POST, 'userid', NULL);
+        $barcode = mosGetParam($_POST, 'barcode', NULL);
-        $search_user = mosGetParam($_POST, 'search_user', NULL);
-        $select_user = mosGetParam($_POST, 'select_user', NULL);
@@ -260 +261 @@
-        if($userid) {
-                $database->setQuery( "SELECT `id`,`name`,`username` FROM `#__users` WHERE `id`='$userid'" );
+                $database->loadObject( $user );
+        } elseif($barcode) {
+                $database->setQuery( "SELECT u.id,u.name,u.username"
+                                                                                        ."\n FROM `#__mls_events_barcodes` AS `c`"
+                                                                                        ."\n INNER JOIN `#__users` AS `u` ON c.userid=u.id"
+                                                                                        ."\n WHERE c.code='$barcode'" );
-                $database->loadObject( $user );
-        } elseif($search_user) {
@@ -1371 +1378 @@
-        $config .= "\$cnf_mls_catering[\"show_form\"] = ".$_POST["show_form"].";\n";
-        $config .= "\$cnf_mls_catering[\"currency\"] = \"".$_POST["currency"]."\";\n";
+        $config .= "\$cnf_mls_catering[\"search_default\"] = \"".$_POST["search_default"]."\";\n";
-        $config .= "?>";
-
@@ -1390 +1398 @@
-        $lists["show_form"] = mosHTML::selectList($opts,'show_form',' class="inputbox" size="2"','value','text',$confarr["show_form"]);
-        
+        /** Search default **/
+        $opts = array();
+        $opts[] = mosHTML::makeOption('userid',$l->m("userid"));
+        $opts[] = mosHTML::makeOption('barcode',$l->m("barcode"));
+        $lists["search_default"] = mosHTML::selectList($opts,'search_default','class="inputbox"','value','text',$confarr["search_default"]);
+        
-        HTML_MLS_catering_config::editConfig($confarr, $lists, $option, $act);
-}

trunk/com_mls_catering/lang/english.php

@@ -177 +177 @@
-                "msg_into_account" => "%s have been paid into the user's Account!",
-                "msg_order_complete" => "Order complete",
-
+
+
-
-$lang_data["configuration"] = array(
@@ -186 +187 @@
-                "no_form_view_only" => "Do not create the form, display items only",
-                "orders_enabled" => "Create form, orders can be placed",
-
+
+
+
+
-
-?>